summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2004-05-31 04:56:55 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2004-05-31 04:56:55 +0000
commit65f1dc9e434669d152747eb787485c369337544e (patch)
treed0d6247b7479155b6b47d421c7e3edfe14963079
parent8fe6d793e1887adb73b0ad8bd976223e4660b04a (diff)
downloadgst-plugins-bad-65f1dc9e434669d152747eb787485c369337544e.tar.gz
gst-plugins-bad-65f1dc9e434669d152747eb787485c369337544e.tar.bz2
gst-plugins-bad-65f1dc9e434669d152747eb787485c369337544e.zip
ext/vorbis/vorbisdec.c: Initialise b_o_s and e_o_s variables
Original commit message from CVS: * ext/vorbis/vorbisdec.c: (vorbis_dec_chain): Initialise b_o_s and e_o_s variables * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data): Add some unusual fourcc's from mplayer avi's * gst/multipart/multipartmux.c: (gst_multipart_mux_plugin_init): Make the muxer have rank GST_RANK_NONE, so it doesn't mess up autoplugging.
-rw-r--r--ChangeLog10
-rw-r--r--gst-libs/gst/riff/riff-media.c10
2 files changed, 20 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ae7c6aa5..ffde6039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-31 Jan Schmidt <thaytan@mad.scientist.com>
+ * ext/vorbis/vorbisdec.c: (vorbis_dec_chain):
+ Initialise b_o_s and e_o_s variables
+ * gst-libs/gst/riff/riff-media.c:
+ (gst_riff_create_video_caps_with_data):
+ Add some unusual fourcc's from mplayer avi's
+ * gst/multipart/multipartmux.c: (gst_multipart_mux_plugin_init):
+ Make the muxer have rank GST_RANK_NONE, so it doesn't mess up
+ autoplugging.
+
2004-05-28 Wim Taymans <wim@fluendo.com>
* configure.ac:
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 1211a0a7..c6ca1501 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -89,12 +89,22 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
case GST_MAKE_FOURCC ('M', 'P', 'E', 'G'):
case GST_MAKE_FOURCC ('M', 'P', 'G', 'I'):
+ case GST_MAKE_FOURCC ('m', 'p', 'g', '1'):
+ case GST_MAKE_FOURCC ('M', 'P', 'G', '1'):
caps = gst_caps_new_simple ("video/mpeg",
"systemstream", G_TYPE_BOOLEAN, FALSE,
"mpegversion", G_TYPE_INT, 1, NULL);
if (codec_name)
*codec_name = g_strdup ("MPEG video");
break;
+ case GST_MAKE_FOURCC ('M', 'P', 'G', '2'):
+ case GST_MAKE_FOURCC ('m', 'p', 'g', '2'):
+ caps = gst_caps_new_simple ("video/mpeg",
+ "systemstream", G_TYPE_BOOLEAN, FALSE,
+ "mpegversion", G_TYPE_INT, 2, NULL);
+ if (codec_name)
+ *codec_name = g_strdup ("MPEG 2 video");
+ break;
case GST_MAKE_FOURCC ('H', '2', '6', '3'):
caps = gst_caps_new_simple ("video/x-h263", NULL);