[FFmpeg-cvslog] avformat/mov: Fix parsing of tfdt when using sample descriptors.
Jacob Trimble
git at videolan.org
Thu Apr 5 21:20:10 EEST 2018
ffmpeg | branch: master | Jacob Trimble <modmaker-at-google.com at ffmpeg.org> | Wed Apr 4 12:30:56 2018 -0700| [b08c132a9c590cf5c3905a48b12527765fc91647] | committer: Michael Niedermayer
avformat/mov: Fix parsing of tfdt when using sample descriptors.
Signed-off-by: Jacob Trimble <modmaker at google.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b08c132a9c590cf5c3905a48b12527765fc91647
---
libavformat/mov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index e7c32e6148..97b1462aab 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4601,7 +4601,7 @@ static int mov_read_tfdt(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return AVERROR_INVALIDDATA;
}
sc = st->priv_data;
- if (sc->pseudo_stream_id + 1 != frag->stsd_id)
+ if (sc->pseudo_stream_id + 1 != frag->stsd_id && sc->pseudo_stream_id != -1)
return 0;
version = avio_r8(pb);
avio_rb24(pb); /* flags */
More information about the ffmpeg-cvslog
mailing list