[FFmpeg-cvslog] Skip chan tag padding.

Carl Eugen Hoyos git at videolan.org
Wed Aug 1 08:39:06 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Aug  1 08:33:18 2012 +0200| [d1ebb25ac6ef9348e5f27c38be0971198810999d] | committer: Carl Eugen Hoyos

Skip chan tag padding.

Fixes ticket #1580

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

 libavformat/mov_chan.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index c0b5711..3d02aff 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -570,6 +570,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
         avio_rl32(pb);                      // mCoordinates[0]
         avio_rl32(pb);                      // mCoordinates[1]
         avio_rl32(pb);                      // mCoordinates[2]
+        size -= 20;
         if (layout_tag == 0) {
             uint32_t mask_incr = mov_get_channel_label(label);
             if (mask_incr == 0) {
@@ -583,6 +584,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
             st->codec->channel_layout = label_mask;
     else
         st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap);
+    avio_skip(pb, size - 12);
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list