[FFmpeg-cvslog] avidec: workaround aac with broken block align

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 18 21:47:22 2012 +0200| [8d07742cb1cda0d3aad3908fa57780fe8a659ea9] | committer: Michael Niedermayer

avidec: workaround aac with broken block align

Fixes Ticket1742

Based on patch by: Nikola Vranic <nikola.vranic at rt-rk.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d07742cb1cda0d3aad3908fa57780fe8a659ea9
---

 libavformat/avidec.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 3e85d4e..c4d41e5 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;