From d08a7da76b99ebe6c67ba3a76aaaa346298f0b09 Mon Sep 17 00:00:00 2001 From: zhangfei gao Date: Wed, 14 Feb 2007 12:07:01 +0000 Subject: [PATCH] gst/avi/gstavimux.c: Allow muxing video/x-h264 (was already in the caps). Fixes #407780. Original commit message from CVS: Patch by: zhangfei gao * gst/avi/gstavimux.c: (gst_avi_mux_vidsink_set_caps): Allow muxing video/x-h264 (was already in the caps). Fixes #407780. --- ChangeLog | 11 +++++++++-- gst/avi/gstavimux.c | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5c807831..3f5193316 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,18 @@ -2007-02-14 Wim Taymans,,, +2007-02-14 Stefan Kost + + Patch by: zhangfei gao + + * 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 Patch by: jp.liu * gst/rtsp/rtspurl.c: (rtsp_url_parse): Fix parsing of password field in url. Fixes #407797. -2007-02-14 Wim Taymans,,, +2007-02-14 Wim Taymans * 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 84dc51aec..e44732a9a 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; -- 2.34.1