diff options
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index bcd5894f0a..c110b7f6fa 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -499,25 +499,30 @@ static const MovChannelLayout mov_channel_layout[] = { { AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY, (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11 { 0, 0}, }; - -void ff_mov_read_chan(AVFormatContext *s, int64_t size, AVCodecContext *codec) +#if 0 +int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size) { + AVCodecContext *codec= st->codec; uint32_t layout_tag; AVIOContext *pb = s->pb; const MovChannelLayout *layouts = mov_channel_layout; + + if (size < 12) + return AVERROR_INVALIDDATA; + layout_tag = avio_rb32(pb); size -= 4; if (layout_tag == 0) { // kCAFChannelLayoutTag_UseChannelDescriptions // Channel descriptions not implemented av_log_ask_for_sample(s, "Unimplemented container channel layout.\n"); avio_skip(pb, size); - return; + return 0; } if (layout_tag == 0x10000) { // kCAFChannelLayoutTag_UseChannelBitmap codec->channel_layout = avio_rb32(pb); size -= 4; avio_skip(pb, size); - return; + return 0; } while (layouts->channel_layout) { if (layout_tag == layouts->layout_tag) { @@ -529,7 +534,10 @@ void ff_mov_read_chan(AVFormatContext *s, int64_t size, AVCodecContext *codec) if (!codec->channel_layout) av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n"); avio_skip(pb, size); + + return 0; } +#endif void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout) { |