diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 21:47:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 22:39:54 +0200 |
| commit | 8d07742cb1cda0d3aad3908fa57780fe8a659ea9 (patch) | |
| tree | 33bc74ff76af19fa5de7d35c46dc4b1f8154c0c6 | |
| parent | 8e2a950b297b97605e97c454363f2f8555b004f0 (diff) | |
| download | ffmpeg-8d07742cb1cda0d3aad3908fa57780fe8a659ea9.tar.gz | |
avidec: workaround aac with broken block align
Fixes Ticket1742
Based on patch by: Nikola Vranic <nikola.vranic@rt-rk.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/avidec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3e85d4e36e..c4d41e5449 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -676,6 +676,10 @@ static int avi_read_header(AVFormatContext *s) st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV; ast->dshow_block_align = 0; } + if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align) { + av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align); + ast->dshow_block_align = 0; + } break; case AVMEDIA_TYPE_SUBTITLE: st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; |