generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Support reading chan atoms with empty channel descriptions.

Browse Source 
Fixes ticket 263.
This commit is contained in:
Andrew Wason 2011-06-15 11:09:17 +02:00 committed by Carl Eugen Hoyos
parent dbf23d191a
commit 4f4d1358ae
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/isom.c
View File

@ -459,16 +459,18 @@ void ff_mov_read_chan(AVFormatContext *s, int64_t size, AVCodecContext *codec)
uint32_t layout_tag; uint32_t layout_tag;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
const MovChannelLayout *layouts = mov_channel_layout; const MovChannelLayout *layouts = mov_channel_layout;
if (size != 12) { layout_tag = avio_rb32(pb);
size -= 4;
if (layout_tag == 0) { //< kCAFChannelLayoutTag_UseChannelDescriptions
// Channel descriptions not implemented // Channel descriptions not implemented
av_log_ask_for_sample(s, "Unimplemented container channel layout.\n"); av_log_ask_for_sample(s, "Unimplemented container channel layout.\n");
avio_skip(pb, size); avio_skip(pb, size);
return; return;
} }
layout_tag = avio_rb32(pb);
if (layout_tag == 0x10000) { //< kCAFChannelLayoutTag_UseChannelBitmap if (layout_tag == 0x10000) { //< kCAFChannelLayoutTag_UseChannelBitmap
codec->channel_layout = avio_rb32(pb); codec->channel_layout = avio_rb32(pb);
avio_skip(pb, 4); size -= 4;
avio_skip(pb, size);
return; return;
} }
while (layouts->channel_layout) { while (layouts->channel_layout) {
@ -480,7 +482,7 @@ void ff_mov_read_chan(AVFormatContext *s, int64_t size, AVCodecContext *codec)
} }
if (!codec->channel_layout) if (!codec->channel_layout)
av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n"); av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n");
avio_skip(pb, 8); avio_skip(pb, size);
} }
void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout) void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout)