summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-02 18:45:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-02 19:59:10 +0200
commitebb8dd437b7d6f88611b3e4cc00ff035297d685c (patch)
tree40bdad7cec2303bd222515701fff6f53cd73ce7b
parent95666b22989b9b9f91a27da01b2bdbf4ee8022d3 (diff)
mov: fix trun / pseudo_stream_id handling
This fixes simple concatenated h264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/mov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8b1ef01dfd..b06dcdb828 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);