avformat/avidec: Add flac to the dshow_block_align exception list
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 12 Aug 2015 01:11:15 +0000 (03:11 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 12 Aug 2015 01:11:15 +0000 (03:11 +0200)
Fixes Ticket4758

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/avidec.c

index 42b75c0..0761ebc 100644 (file)
@@ -872,8 +872,9 @@ 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 ||
-                        st->codec->codec_id == AV_CODEC_ID_MP2 && 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_FLAC && 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;
                     }