mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2008-07-15 13:05:04 +00:00
parent d6d5f88174
commit dd7d36320e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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):

5
gst-libs/gst/riff/riff-media.c
View file

@ -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'):