summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-11-30 16:48:51 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-11-30 16:48:51 +0000
commit541a13d0e22393a348c83dddec455115bf70823e (patch)
tree95f92055ef7bb909e4bab052b237a8651dfa8e9d
parentd5ce2baebb5ec852541068266bfabf3f6842595e (diff)
gst/avi/gstavimux.c: accept all mpegversions,fixes #380825 spotted by: Jerome Alet
Original commit message from CVS: * gst/avi/gstavimux.c: accept all mpegversions,fixes #380825 spotted by: Jerome Alet
-rw-r--r--ChangeLog6
-rw-r--r--gst/avi/gstavimux.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb2c0862..65d54698 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-11-30 Stefan Kost <ensonic@users.sf.net>
+ * gst/avi/gstavimux.c:
+ accept all mpegversions,fixes #380825
+ spotted by: Jerome Alet
+
+2006-11-30 Stefan Kost <ensonic@users.sf.net>
+
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_fill_format_list),
(gst_v4l2src_queue_frame), (gst_v4l2src_grab_frame),
(gst_v4l2src_get_capture), (gst_v4l2src_set_capture),
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 57c8ffbf..603ffe7b 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -136,7 +136,7 @@ static GstStaticPadTemplate video_sink_factory =
"width = (int) [ 16, 4096 ], "
"height = (int) [ 16, 4096 ], "
"framerate = (fraction) [ 0, MAX ], "
- "mpegversion = (int) 1, "
+ "mpegversion = (int) { 1, 2, 4}, "
"systemstream = (boolean) FALSE; "
"video/x-h263, "
"width = (int) [ 16, 4096 ], "