diff mbox series

[FFmpeg-devel] avformat/mov: Discard last STSC if its empty

Message ID 20200204134842.32297-1-michael@niedermayer.cc
State Accepted
Headers show
Series [FFmpeg-devel] avformat/mov: Discard last STSC if its empty | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Michael Niedermayer Feb. 4, 2020, 1:48 p.m. UTC 
Fixes: Ticket8508
---
 libavformat/mov.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer April 4, 2020, 8:22 p.m. UTC | #1 
On Tue, Feb 04, 2020 at 02:48:42PM +0100, Michael Niedermayer wrote:
> Fixes: Ticket8508
> ---
>  libavformat/mov.c | 4 ++++
>  1 file changed, 4 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index bbaf266a4b..726e69ba53 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2665,6 +2665,10 @@  static int mov_read_stsc(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             sc->stsc_data[i].id < 1) {
             av_log(c->fc, AV_LOG_WARNING, "STSC entry %d is invalid (first=%d count=%d id=%d)\n", i, sc->stsc_data[i].first, sc->stsc_data[i].count, sc->stsc_data[i].id);
             if (i+1 >= sc->stsc_count) {
+                if (sc->stsc_data[i].count == 0 && i > 0) {
+                    sc->stsc_count --;
+                    continue;
+                }
                 sc->stsc_data[i].first = FFMAX(sc->stsc_data[i].first, first_min);
                 if (i > 0 && sc->stsc_data[i].first <= sc->stsc_data[i-1].first)
                     sc->stsc_data[i].first = FFMIN(sc->stsc_data[i-1].first + 1LL, INT_MAX);