summaryrefslogtreecommitdiffstats
path: root/gst/matroska
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2009-06-23 14:32:43 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2009-06-23 14:32:43 +0200
commit8a4dc37544b962ddca441f5b3efa9a25b7e3aef8 (patch)
treef0d25adc0469099bb681bc2b1bdac6acf66548c3 /gst/matroska
parent9600c549380d97f79e7a948a3367962405c93f05 (diff)
matroske: fix compiler error
change gpointer to guint8 * for codec_state and codec_priv as some functions operate on those types and it avoids breaking strict-aliasing rules.
Diffstat (limited to 'gst/matroska')
-rw-r--r--gst/matroska/matroska-demux.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 07371750..b1dfc441 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1704,7 +1704,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux)
if (context->encodings && context->encodings->len > 0 && context->codec_priv
&& context->codec_priv_size > 0) {
if (!gst_matroska_decode_data (context->encodings,
- (guint8 **) & context->codec_priv, &context->codec_priv_size,
+ &context->codec_priv, &context->codec_priv_size,
GST_MATROSKA_TRACK_ENCODING_SCOPE_CODEC_DATA, TRUE)) {
GST_WARNING_OBJECT (demux, "Decoding codec private data failed");
ret = GST_FLOW_ERROR;
@@ -3652,10 +3652,10 @@ gst_matroska_demux_push_dvd_clut_change_event (GstMatroskaDemux * demux,
* elsewhere, but for now, only interested in a small part */
/* make sure we have terminating 0 */
- buf = g_strndup (stream->codec_priv, stream->codec_priv_size);
+ buf = g_strndup ((gchar *) stream->codec_priv, stream->codec_priv_size);
/* just locate and parse palette part */
- start = strstr (stream->codec_priv, "palette:");
+ start = strstr ((gchar *) stream->codec_priv, "palette:");
if (start) {
gint i;
guint32 clut[16];
@@ -4203,7 +4203,7 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
if (stream->encodings && stream->encodings->len > 0
&& stream->codec_state && stream->codec_state_size > 0) {
if (!gst_matroska_decode_data (stream->encodings,
- (guint8 **) & stream->codec_state, &stream->codec_state_size,
+ &stream->codec_state, &stream->codec_state_size,
GST_MATROSKA_TRACK_ENCODING_SCOPE_CODEC_DATA, TRUE)) {
GST_WARNING_OBJECT (demux, "Decoding codec state failed");
}