mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 02:00:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View file

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