ext/ffmpeg/:

Original commit message from CVS:
Patch by: Ole André Vadla Ravnås <ole dot andre dot ravnas at tandberg dot com>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_init):

4 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index eaa95f4..d505365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-08  Edward Hervey  <bilboed@bilboed.com>
+
+	Patch by: Ole André Vadla Ravnås <ole dot andre dot ravnas at tandberg dot com>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
+	* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_init):
+
 2007-11-03  Edward Hervey  <bilboed@bilboed.com>
 
 	* ext/ffmpeg/gstffmpeg.c: (gst_ffmpeg_avcodec_open),
diff --git a/common b/common
-Subproject 34d7d649b972ea4915611a6ed88f01613bf3277
+Subproject 423e2ea96b5f79281f4dd20d734bd968b3d95e8
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index d0696e7..2de5811 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1584,7 +1584,7 @@ gst_ffmpeg_caps_with_codecid (enum CodecID codec_id,
 
           flags = GUINT16_FROM_LE (flags);
 
-          memcpy (context->extradata + 0x62, &flags, 2);
+          memcpy ((gchar *) context->extradata + 0x62, &flags, 2);
           context->extradata_size = 0x64;
         }
       }
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 94de5a8..4d14407 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -206,7 +206,7 @@ gst_ffmpegmux_init (GstFFMpegMux * ffmpegmux, GstFFMpegMuxClass * g_class)
   ffmpegmux->context = g_new0 (AVFormatContext, 1);
   ffmpegmux->context->oformat = oclass->in_plugin;
   ffmpegmux->context->nb_streams = 0;
-  snprintf (ffmpegmux->context->filename,
+  g_snprintf (ffmpegmux->context->filename,
       sizeof (ffmpegmux->context->filename),
       "gstreamer://%p", ffmpegmux->srcpad);
   ffmpegmux->opened = FALSE;