[FFmpeg-cvslog] mov: skip version and flags attributes in mov_read_chan()

Matthieu Bouron git at videolan.org
Sat Dec 6 01:29:00 CET 2014


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Thu Dec  4 19:13:39 2014 +0000| [8c0a865ad96b9e8542051f75b0edc424cb73994e] | committer: Vittorio Giovara

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 at libav.org
Sample-Id: ticket1474.mov
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

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

 libavformat/mov.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 13dc94b..95c7106 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;



More information about the ffmpeg-cvslog mailing list