qtdemux: Don't use invalid values from failed trex parsing

If parsing the fragment default values (`trex` atom) failed, don't try to
compute a bogus sample_description_id value.

Fixes #1369

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2862>
This commit is contained in:
Edward Hervey 2022-08-11 08:48:08 +02:00 committed by Tim-Philipp Müller
parent 7ef60aa0f9
commit 9551f909d7

View file

@ -3575,11 +3575,13 @@ qtdemux_parse_tfhd (GstQTDemux * qtdemux, GstByteReader * tfhd,
goto invalid_track;
/* obtain stream defaults */
qtdemux_parse_trex (qtdemux, *stream,
default_sample_duration, default_sample_size, default_sample_flags);
if (qtdemux_parse_trex (qtdemux, *stream,
default_sample_duration, default_sample_size, default_sample_flags)) {
(*stream)->stsd_sample_description_id =
(*stream)->def_sample_description_index - 1;
/* Default sample description index is only valid if trex parsing succeeded */
(*stream)->stsd_sample_description_id =
(*stream)->def_sample_description_index - 1;
}
if (flags & TF_SAMPLE_DESCRIPTION_INDEX) {
guint32 sample_description_index;