[FFmpeg-cvslog] avidec: override sample size of 1024 for VBR AAC

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 10 16:36:46 2012 +0200| [229e33a2b6de450f0d2c5fd669c21f226267d93b] | committer: Michael Niedermayer

avidec: override sample size of 1024 for VBR AAC

Fixes Ticket1755

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index b4c5fe8..185c67c 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -681,6 +681,10 @@ static int avi_read_header(AVFormatContext *s)
                         av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align);
                         ast->dshow_block_align = 0;
                     }
+                    if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024) {
+                        av_log(s, AV_LOG_DEBUG, "overriding sample_size\n", ast->dshow_block_align);
+                        ast->sample_size = 0;
+                    }
                     break;
                 case AVMEDIA_TYPE_SUBTITLE:
                     st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;