Fix Forte compiler warnings.

Don't do void pointer arithmetic. Don't have an unreachable statement.

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index b8ad83064028676fb2aef146a0965aeab4e043eb..aafdd2adc7e5bca99fa8d7160414256545cbfa54 100644 (file)
--- 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 0fa2742360d58c8840d3b0fd2da3ecc38a5fc4ab..746e3d194713a5ccdcad4d1c64c7fcc7640cb29f 100644 (file)
--- 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);