From ea931c47d658f0800d92c0cb90e284fa28af79a6 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sun, 16 Dec 2007 23:46:16 +0000 Subject: [PATCH] gst-libs/gst/riff/riff-media.c: Be apologetic of software that use the 'jpeg' instead of 'JPEG' FOURCC for jpeg video... 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. --- ChangeLog | 8 ++++++++ gst-libs/gst/riff/riff-media.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1b736f2d77..84fbf7fde1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-12-17 Edward Hervey + + * 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 * 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 023831cbca..6abea70cdf 100644 --- 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)