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

h264parse: Clear SPS info after processing.

Browse source 
The SPS struct might be filled out by a call to
gst_h264_parser_parse_subset_sps, which fills out
dynamically allocated data and requires a call
to gst_h264_sps_clear() to free it. Also make sure
to clear out any allocated SPS data when returning
an error.

https://bugzilla.gnome.org/show_bug.cgi?id=753306
This commit is contained in:
Jan Schmidt 2015-08-06 14:33:54 +10:00
parent 7a2f5d6b03
commit fdac09d843
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/codecparsers/gsth264parser.c
View file

@ -1845,8 +1845,10 @@ gst_h264_parser_parse_subset_sps (GstH264NalParser * nalparser,
if (res == GST_H264_PARSER_OK) {
GST_DEBUG ("adding sequence parameter set with id: %d to array", sps->id);
if (!gst_h264_sps_copy (&nalparser->sps[sps->id], sps))
if (!gst_h264_sps_copy (&nalparser->sps[sps->id], sps)) {
gst_h264_sps_clear (sps);
return GST_H264_PARSER_ERROR;
}
nalparser->last_sps = &nalparser->sps[sps->id];
}
return res;
@ -1899,6 +1901,7 @@ gst_h264_parse_subset_sps (GstH264NalUnit * nalu, GstH264SPS * sps,
error:
GST_WARNING ("error parsing \"Subset sequence parameter set\"");
gst_h264_sps_clear (sps);
sps->valid = FALSE;
return GST_H264_PARSER_ERROR;
}

1
gst/videoparsers/gsth264parse.c
View file

@ -746,6 +746,7 @@ gst_h264_parse_process_nal (GstH264Parse * h264parse, GstH264NalUnit * nalu)
}
gst_h264_parser_store_nal (h264parse, sps.id, nal_type, nalu);
gst_h264_sps_clear (&sps);
h264parse->state |= GST_H264_PARSE_STATE_GOT_SPS;
h264parse->header |= TRUE;
break;