diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-12-11 17:37:40 +0100 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-12-13 23:07:40 +0100 |
commit | 36be045ed7942e07742c3cf3d3012b1d2a9ec344 (patch) | |
tree | 29dc61663ced6672a5fc0181a08ed1f03582cc45 /libavcodec/aacdec.c | |
parent | 16b771b1f47daa9fec84477040984d83a92ba4a6 (diff) | |
download | ffmpeg-36be045ed7942e07742c3cf3d3012b1d2a9ec344.tar.gz |
Support "VLB " audio in NSV files.
See samples/nsv/vlb_audio.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r-- | libavcodec/aacdec.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index a046d991e6..2b2ae8a80d 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2125,13 +2125,14 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) } if (!ac->avctx->sample_rate) ac->avctx->sample_rate = hdr_info.sample_rate; - if (hdr_info.num_aac_frames == 1) { - if (!hdr_info.crc_absent) - skip_bits(gb, 16); - } else { + if (!ac->warned_num_aac_frames && hdr_info.num_aac_frames != 1) { + // This is 2 for "VLB " audio in NSV files. + // See samples/nsv/vlb_audio. av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame is", 0); - return -1; + ac->warned_num_aac_frames = 1; } + if (!hdr_info.crc_absent) + skip_bits(gb, 16); } return size; } |