gst/avi/gstavimux.c: Allow muxing video/x-h264 (was already in the caps). Fixes ...

Original commit message from CVS:
Patch by: zhangfei gao <gaozhangfei@yahoo.com.cn>
* gst/avi/gstavimux.c: (gst_avi_mux_vidsink_set_caps):
Allow muxing video/x-h264 (was already in the caps). Fixes #407780.

diff --git a/ChangeLog b/ChangeLog
index c5c807831103c9930cd8dab2b8f116b7e365bb8e..3f51933168ceb3c8f0e731a8f34f2228df199ac6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
-2007-02-14  Wim Taymans,,,  <wim@fluendo.com>
+2007-02-14  Stefan Kost  <ensonic@users.sf.net>
+
+       Patch by: zhangfei gao <gaozhangfei@yahoo.com.cn>
+
+       * gst/avi/gstavimux.c: (gst_avi_mux_vidsink_set_caps):
+       Allow muxing video/x-h264 (was already in the caps). Fixes #407780.
+
+2007-02-14  Wim Taymans  <wim@fluendo.com>
 
        Patch by: jp.liu <jp_liu at astrocom dot cn>
 
        * gst/rtsp/rtspurl.c: (rtsp_url_parse):
        Fix parsing of password field in url. Fixes #407797.
 
-2007-02-14  Wim Taymans,,,  <wim@fluendo.com>
+2007-02-14  Wim Taymans  <wim@fluendo.com>
 
        * gst/wavparse/gstwavparse.c: (gst_wavparse_class_init),
        (gst_wavparse_reset), (gst_wavparse_init),

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 84dc51aecd8c0e3908db1cf0ce223f5169a1a370..e44732a9a69ea55161a7d285b80625352e97e386 100644 (file)
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -523,6 +523,8 @@ gst_avi_mux_vidsink_set_caps (GstPad * pad, GstCaps * vscaps)
       avipad->vids.compression = GST_MAKE_FOURCC ('D', 'V', 'S', 'D');
     } else if (!strcmp (mimetype, "video/x-h263")) {
       avipad->vids.compression = GST_MAKE_FOURCC ('H', '2', '6', '3');
+    } else if (!strcmp (mimetype, "video/x-h264")) {
+      avipad->vids.compression = GST_MAKE_FOURCC ('H', '2', '6', '4');
     } else if (!strcmp (mimetype, "video/mpeg")) {
       gint mpegversion;