aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2014-12-04 19:13:39 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-12-05 13:03:49 +0000
commit8c0a865ad96b9e8542051f75b0edc424cb73994e (patch)
tree15ef29bc03e513481b6b4ee09b4ec7383a12a688
parentb72727a5248f1ef02db99b378dce1eb48a46357a (diff)
downloadffmpeg-8c0a865ad96b9e8542051f75b0edc424cb73994e.tar.gz
mov: skip version and flags attributes in mov_read_chan()
Fixes decting channel layout for files with uncommon audio, such as FL and FR in two separate streams. Introduced in 3bab7cd. CC: libav-devel@libav.org Sample-Id: ticket1474.mov Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
-rw-r--r--libavformat/mov.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 13dc94b571..95c7106ba3 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -634,6 +634,9 @@ static int mov_read_chan(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (atom.size < 16)
return 0;
+ /* skip version and flags */
+ avio_skip(pb, 4);
+
ff_mov_read_chan(c->fc, pb, st, atom.size - 4);
return 0;