diff options
| author | Jan Schmidt <jan.schmidt@sun.com> | 2009-01-30 17:26:19 +0000 |
|---|---|---|
| committer | Jan Schmidt <jan.schmidt@sun.com> | 2009-01-30 17:26:19 +0000 |
| commit | 367f9123def760d79d3cba3e86e00af098a644a0 (patch) | |
| tree | b5cd1dc61acb587b9cc5cfa5320a66f7716d5ae3 /gst/matroska | |
| parent | 908c0da5f9e175ceec3a2eb0c8231f1623d2a74c (diff) | |
Fix Forte compiler warnings.
Don't do void pointer arithmetic. Don't have an unreachable statement.
Diffstat (limited to 'gst/matroska')
| -rw-r--r-- | gst/matroska/matroska-demux.c | 12 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index b8ad8306..aafdd2ad 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -156,10 +156,10 @@ gst_matroska_demux_change_state (GstElement * element, /* caps functions */ static GstCaps *gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * videocontext, - const gchar * codec_id, gpointer data, guint size, gchar ** codec_name); + const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name); static GstCaps *gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * audiocontext, - const gchar * codec_id, gpointer data, guint size, gchar ** codec_name); + const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name); static GstCaps * gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext * subtitlecontext, const gchar * codec_id, gpointer data, guint size); @@ -581,8 +581,8 @@ gst_matroska_demux_read_track_encoding (GstMatroskaDemux * demux, break; } } - break; DEBUG_ELEMENT_STOP (demux, ebml, "ContentCompression", ret); + break; } case GST_MATROSKA_ID_CONTENTENCRYPTION: @@ -1713,7 +1713,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) templ = gst_element_class_get_pad_template (klass, "video_%02d"); caps = gst_matroska_demux_video_caps (videocontext, context->codec_id, - context->codec_priv, context->codec_priv_size, &codec); + (guint8 *) context->codec_priv, context->codec_priv_size, &codec); if (codec) { list = gst_tag_list_new (); gst_tag_list_add (list, GST_TAG_MERGE_REPLACE, @@ -4931,7 +4931,7 @@ gst_matroska_demux_sink_activate_pull (GstPad * sinkpad, gboolean active) static GstCaps * gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * - videocontext, const gchar * codec_id, gpointer data, guint size, + videocontext, const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name) { GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) videocontext; @@ -5282,7 +5282,7 @@ aac_profile_idx (const gchar * codec_id) static GstCaps * gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * - audiocontext, const gchar * codec_id, gpointer data, guint size, + audiocontext, const gchar * codec_id, guint8 * data, guint size, gchar ** codec_name) { GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) audiocontext; diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 0fa27423..746e3d19 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -1130,7 +1130,7 @@ flac_streamheader_to_codecdata (const GValue * streamheader, context->codec_priv = g_realloc (context->codec_priv, context->codec_priv_size + GST_BUFFER_SIZE (buffer)); - memcpy (context->codec_priv + context->codec_priv_size, + memcpy ((guint8 *) context->codec_priv + context->codec_priv_size, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer)); context->codec_priv_size = context->codec_priv_size + GST_BUFFER_SIZE (buffer); |