diff mbox

[FFmpeg-devel] avformat/mov: Fix parsing of tfdt when using sample descriptors.

Message ID 20180404193056.241738-1-modmaker@google.com
State Accepted
Commit b08c132a9c590cf5c3905a48b12527765fc91647
Headers show

Commit Message

Jacob Trimble April 4, 2018, 7:30 p.m. UTC 
Signed-off-by: Jacob Trimble <modmaker@google.com>
---
 libavformat/mov.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer April 5, 2018, 6:18 p.m. UTC | #1 
On Wed, Apr 04, 2018 at 12:30:56PM -0700, Jacob Trimble wrote:
> Signed-off-by: Jacob Trimble <modmaker@google.com>
> ---
>  libavformat/mov.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply

thx

[...]
diff mbox

Patch

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 */