gst/qtdemux/qtdemux.c: Don't touch non-existing data (fixes crash on file in #140147).
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (qtdemux_audio_caps): Don't touch non-existing data (fixes crash on file in #140147).
This commit is contained in:
parent
e24bb3990d
commit
fe20ee4218
@ -1,3 +1,8 @@
|
|||||||
|
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
|
||||||
|
Don't touch non-existing data (fixes crash on file in #140147).
|
||||||
|
|
||||||
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
2004-09-13 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* gst/playback/gstplaybasebin.c:
|
* gst/playback/gstplaybasebin.c:
|
||||||
|
@ -2525,10 +2525,12 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, guint32 fourcc, const guint8 * data,
|
|||||||
"mpegversion", G_TYPE_INT, 4, NULL);
|
"mpegversion", G_TYPE_INT, 4, NULL);
|
||||||
case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'):
|
case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'):
|
||||||
/* FIXME: QDesign music version 2 (no constant) */
|
/* FIXME: QDesign music version 2 (no constant) */
|
||||||
return gst_caps_new_simple ("audio/x-qdm2",
|
if (data)
|
||||||
"framesize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 52),
|
return gst_caps_new_simple ("audio/x-qdm2",
|
||||||
"bitrate", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 40),
|
"framesize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 52),
|
||||||
"blocksize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 44), NULL);
|
"bitrate", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 40),
|
||||||
|
"blocksize", G_TYPE_INT, QTDEMUX_GUINT32_GET (data + 44), NULL);
|
||||||
|
return gst_caps_new_simple ("audio/x-qdm2", NULL);
|
||||||
case GST_MAKE_FOURCC ('a', 'g', 's', 'm'):
|
case GST_MAKE_FOURCC ('a', 'g', 's', 'm'):
|
||||||
/* GSM */
|
/* GSM */
|
||||||
return gst_caps_new_simple ("audio/x-gsm", NULL);
|
return gst_caps_new_simple ("audio/x-gsm", NULL);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user