RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip chan tag padding. 

Fixes ticket #1580
This commit is contained in:
Carl Eugen Hoyos 2012-08-01 08:33:18 +02:00
parent 296bcdd2a7
commit d1ebb25ac6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mov_chan.c
View File

@ -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[0]
avio_rl32(pb); // mCoordinates[1] avio_rl32(pb); // mCoordinates[1]
avio_rl32(pb); // mCoordinates[2] avio_rl32(pb); // mCoordinates[2]
size -= 20;
if (layout_tag == 0) { if (layout_tag == 0) {
uint32_t mask_incr = mov_get_channel_label(label); uint32_t mask_incr = mov_get_channel_label(label);
if (mask_incr == 0) { 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; st->codec->channel_layout = label_mask;
else else
st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap); st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap);
avio_skip(pb, size - 12);
return 0; return 0;
} }