gst-libs/gst/riff/riff-media.c: Be apologetic of software that use the 'jpeg' instead...

Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
Be apologetic of software that use the 'jpeg' instead of 'JPEG' FOURCC
for jpeg video streams.
Add the 'avc1'/'AVC1' fourcc mapping for h264, same software-comment as
for the above modification.

diff --git a/ChangeLog b/ChangeLog
index 1b736f2..84fbf7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-17  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+       * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
+       Be apologetic of software that use the 'jpeg' instead of 'JPEG' FOURCC
+       for jpeg video streams.
+       Add the 'avc1'/'AVC1' fourcc mapping for h264, same software-comment as
+       for the above modification.
+
 2007-12-15  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst-libs/gst/interfaces/xoverlay.c: (gst_x_overlay_expose),

diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 023831c..6abea70 100644 (file)
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -120,6 +120,7 @@ gst_riff_create_video_caps (guint32 codec_fcc,
       break;
 
     case GST_MAKE_FOURCC ('J', 'P', 'E', 'G'): /* generic (mostly RGB) MJPEG */
+    case GST_MAKE_FOURCC ('j', 'p', 'e', 'g'): /* generic (mostly RGB) MJPEG */
       caps = gst_caps_new_simple ("image/jpeg", NULL);
       if (codec_name)
         *codec_name = g_strdup ("JPEG Still Image");
@@ -230,6 +231,8 @@ gst_riff_create_video_caps (guint32 codec_fcc,
 
     case GST_MAKE_FOURCC ('H', '2', '6', '4'):
     case GST_MAKE_FOURCC ('h', '2', '6', '4'):
+    case GST_MAKE_FOURCC ('a', 'v', 'c', '1'):
+    case GST_MAKE_FOURCC ('A', 'V', 'C', '1'):
       caps = gst_caps_new_simple ("video/x-h264",
           "variant", G_TYPE_STRING, "itu", NULL);
       if (codec_name)