diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | gst/avi/gstavimux.c | 2 |
2 files changed, 11 insertions, 2 deletions
@@ -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 84dc51ae..e44732a9 100644 --- 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; |