diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-08-01 08:33:18 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-08-01 08:33:18 +0200 |
| commit | d1ebb25ac6ef9348e5f27c38be0971198810999d (patch) | |
| tree | dc2a669328f792f50585e48f643c73c53618ab39 /libavformat/mov_chan.c | |
| parent | 296bcdd2a76bb8b98caf7249530dc1cf6e1a2624 (diff) | |
| download | android_external_ffmpeg-d1ebb25ac6ef9348e5f27c38be0971198810999d.tar.gz android_external_ffmpeg-d1ebb25ac6ef9348e5f27c38be0971198810999d.tar.bz2 android_external_ffmpeg-d1ebb25ac6ef9348e5f27c38be0971198810999d.zip | |
Skip chan tag padding.
Fixes ticket #1580
Diffstat (limited to 'libavformat/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index c0b57119d1..3d02aff036 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; } |