Commit dd7d3632 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

gst-libs/gst/riff/riff-media.c: Make it impossible to have NULL caps at the...

gst-libs/gst/riff/riff-media.c: Make it impossible to have NULL caps at the point where we set framerate and other th...

Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
Make it impossible to have NULL caps at the point where we set
framerate and other things. Also don't return immediately for "3ivd"
video and let framerate, etc be set. Might fix bug #542508.
parent d6d5f881
2008-07-15 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps):
Make it impossible to have NULL caps at the point where we set
framerate and other things. Also don't return immediately for "3ivd"
video and let framerate, etc be set. Might fix bug #542508.
2008-07-14 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
 
* gst-libs/gst/video/video.c: (gst_video_format_parse_caps):
......@@ -75,6 +75,7 @@ gst_riff_create_video_caps (guint32 codec_fcc,
"blue_mask", G_TYPE_INT, 0xff0000, NULL);
} else {
GST_WARNING ("Unhandled DIB RGB depth: %d", bpp);
return NULL;
}
} else {
/* for template */
......@@ -344,9 +345,11 @@ gst_riff_create_video_caps (guint32 codec_fcc,
case GST_MAKE_FOURCC ('3', 'i', 'v', 'd'):
case GST_MAKE_FOURCC ('3', 'I', 'V', 'D'):
caps = gst_caps_new_simple ("video/x-msmpeg",
"msmpegversion", G_TYPE_INT, 43, NULL);
if (codec_name)
*codec_name = g_strdup ("Microsoft MPEG-4 4.3"); /* FIXME? */
return gst_caps_from_string ("video/x-msmpeg, msmpegversion = (int) 43");
break;
case GST_MAKE_FOURCC ('3', 'I', 'V', '1'):
case GST_MAKE_FOURCC ('3', 'I', 'V', '2'):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment