aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-10 16:36:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-10 16:48:58 +0200
commit229e33a2b6de450f0d2c5fd669c21f226267d93b (patch)
tree05987ac1f915d42435993ec8d7b6f531bd8222d9 /libavformat/avidec.c
parentf94edfe484e9ff2f1f548d924e4ad44991d91bf2 (diff)
downloadffmpeg-229e33a2b6de450f0d2c5fd669c21f226267d93b.tar.gz
avidec: override sample size of 1024 for VBR AAC
Fixes Ticket1755 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index b4c5fe8d0c..185c67cae5 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;