[FFmpeg-cvslog] mov: fix trun / pseudo_stream_id handling

Michael Niedermayer git at videolan.org
Wed Oct 2 20:41:16 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  2 18:45:59 2013 +0200| [ebb8dd437b7d6f88611b3e4cc00ff035297d685c] | committer: Michael Niedermayer

mov: fix trun / pseudo_stream_id handling

This fixes simple concatenated h264

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebb8dd437b7d6f88611b3e4cc00ff035297d685c
---

 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8b1ef01..b06dcdb 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2636,7 +2636,7 @@ static int mov_read_trun(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;
     avio_r8(pb); /* version */
     flags = avio_rb24(pb);



More information about the ffmpeg-cvslog mailing list