From d08a7da76b99ebe6c67ba3a76aaaa346298f0b09 Mon Sep 17 00:00:00 2001
From: zhangfei gao <gaozhangfei@yahoo.com.cn>
Date: Wed, 14 Feb 2007 12:07:01 +0000
Subject: 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 <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.
---
 ChangeLog | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c5c80783..3f519331 100644
--- 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),
-- 
cgit