mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 06:26:23 +00:00
gst/typefind/gsttypefindfunctions.c: Don't segfault on NULL data.
Original commit message from CVS: * gst/typefind/gsttypefindfunctions.c: (aac_type_find): Don't segfault on NULL data.
This commit is contained in:
parent
ac515f710f
commit
4778549c39
2 changed files with 15 additions and 8 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2004-11-08 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
* gst/typefind/gsttypefindfunctions.c: (aac_type_find):
|
||||||
|
Don't segfault on NULL data.
|
||||||
|
|
||||||
2004-11-08 Wim Taymans <wim@fluendo.com>
|
2004-11-08 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* gst/playback/gstdecodebin.c: (unlinked):
|
* gst/playback/gstdecodebin.c: (unlinked):
|
||||||
|
|
|
@ -222,15 +222,17 @@ aac_type_find (GstTypeFind * tf, gpointer unused)
|
||||||
* note that this is a pretty lame typefind method (14 bits, 0.006%), so
|
* note that this is a pretty lame typefind method (14 bits, 0.006%), so
|
||||||
* we'll only use LIKELY
|
* we'll only use LIKELY
|
||||||
*/
|
*/
|
||||||
if (data[0] == 0xFF && (data[1] & 0xF6) == 0xF0) {
|
if (data) {
|
||||||
gboolean mpegversion = (data[1] & 0x08) ? 2 : 4;
|
if (data[0] == 0xFF && (data[1] & 0xF6) == 0xF0) {
|
||||||
GstCaps *caps = gst_caps_new_simple ("audio/mpeg",
|
gboolean mpegversion = (data[1] & 0x08) ? 2 : 4;
|
||||||
"framed", G_TYPE_BOOLEAN, FALSE,
|
GstCaps *caps = gst_caps_new_simple ("audio/mpeg",
|
||||||
"mpegversion", G_TYPE_INT, mpegversion,
|
"framed", G_TYPE_BOOLEAN, FALSE,
|
||||||
NULL);
|
"mpegversion", G_TYPE_INT, mpegversion,
|
||||||
|
NULL);
|
||||||
|
|
||||||
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, caps);
|
gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, caps);
|
||||||
gst_caps_free (caps);
|
gst_caps_free (caps);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue