avformat/avidec: add mp2 to the list of exceptions instead of generally treating dshow_block_align==1 special
Fixes Ticket4552
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 488383afd1275f6da53e9c83bc209c2f70d768ef)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 9bb3920..08cc956 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -128,7 +128,7 @@
{
if (ast->sample_size)
return len;
- else if (ast->dshow_block_align > 1)
+ else if (ast->dshow_block_align)
return (len + ast->dshow_block_align - 1) / ast->dshow_block_align;
else
return 1;
@@ -866,7 +866,8 @@
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) {
+ if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align ||
+ st->codec->codec_id == AV_CODEC_ID_MP2 && 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;
}