mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

asfdemux: fix assertion error when codec_data is not present in structure

Browse source 
When discovering a particular asf file, caps structure doesn't have
codec_data, and this was not being checked before using the same,
resulting in assertion error

https://bugzilla.gnome.org/show_bug.cgi?id=752803
This commit is contained in:
Vineeth TM 2015-07-24 10:08:34 +09:00 committed by Tim-Philipp Müller
parent 171a1df6eb
commit 5e7d0a8285
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gst/asfdemux/gstasfdemux.c
View file

@ -2572,18 +2572,20 @@ gst_asf_demux_add_video_stream (GstASFDemux * demux,
/* check if h264 has codec_data (avc) or streamheaders (bytestream) */
} else if (gst_structure_has_name (caps_s, "video/x-h264")) {
const GValue *value = gst_structure_get_value (caps_s, "codec_data");
GstBuffer *buf = gst_value_get_buffer (value);
GstMapInfo mapinfo;
if (value) {
GstBuffer *buf = gst_value_get_buffer (value);
GstMapInfo mapinfo;
if (gst_buffer_map (buf, &mapinfo, GST_MAP_READ)) {
if (mapinfo.size >= 4 && GST_READ_UINT32_BE (mapinfo.data) == 1) {
/* this looks like a bytestream start */
streamheader = gst_buffer_ref (buf);
gst_asf_demux_add_stream_headers_to_caps (demux, buf, caps_s);
gst_structure_remove_field (caps_s, "codec_data");
if (gst_buffer_map (buf, &mapinfo, GST_MAP_READ)) {
if (mapinfo.size >= 4 && GST_READ_UINT32_BE (mapinfo.data) == 1) {
/* this looks like a bytestream start */
streamheader = gst_buffer_ref (buf);
gst_asf_demux_add_stream_headers_to_caps (demux, buf, caps_s);
gst_structure_remove_field (caps_s, "codec_data");
}
gst_buffer_unmap (buf, &mapinfo);
}
gst_buffer_unmap (buf, &mapinfo);
}
}