summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-16 01:43:13 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-04-16 01:43:13 +0000
commit0004ce90494aea5208e2a6fab4766ae9b88c0342 (patch)
treeedc414ebc0ae26ccdea7a72fce15e91f4740ce15
parentb38e44828eabca21063f3cc570993d61ca419b7c (diff)
downloadgst-plugins-bad-0004ce90494aea5208e2a6fab4766ae9b88c0342.tar.gz
gst-plugins-bad-0004ce90494aea5208e2a6fab4766ae9b88c0342.tar.bz2
gst-plugins-bad-0004ce90494aea5208e2a6fab4766ae9b88c0342.zip
gst-libs/gst/riff/riff-media.c: Add div[3456] as fourccs for DivX 3 (fixes #140137).
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data): Add div[3456] as fourccs for DivX 3 (fixes #140137).
-rw-r--r--ChangeLog6
-rw-r--r--gst-libs/gst/riff/riff-media.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c4bd4c3..4928de98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-04-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * gst-libs/gst/riff/riff-media.c:
+ (gst_riff_create_video_caps_with_data):
+ Add div[3456] as fourccs for DivX 3 (fixes #140137).
+
+2004-04-15 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
reviewed by: <delete if not using a buddy>
* gst-libs/gst/riff/riff-media.c:
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 621b05ee..ad34dc7d 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -139,9 +139,13 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
break;
case GST_MAKE_FOURCC ('D', 'I', 'V', '3'):
+ case GST_MAKE_FOURCC ('d', 'i', 'v', '3'):
case GST_MAKE_FOURCC ('D', 'I', 'V', '4'):
+ case GST_MAKE_FOURCC ('d', 'i', 'v', '4'):
case GST_MAKE_FOURCC ('D', 'I', 'V', '5'):
+ case GST_MAKE_FOURCC ('d', 'i', 'v', '5'):
case GST_MAKE_FOURCC ('D', 'I', 'V', '6'):
+ case GST_MAKE_FOURCC ('d', 'i', 'v', '6'):
caps = gst_caps_new_simple ("video/x-divx",
"divxversion", G_TYPE_INT, 3, NULL);
if (codec_name)