avformat/avidec: Simplify dshow_block_align based special case detection

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
10 years ago · 0d2a62d257
parent f9905e13ea
commit 0d2a62d257
1 changed files with 3 additions and 3 deletions
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@ -875,9 +875,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_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) {
+                    if ((st->codec->codec_id == AV_CODEC_ID_AAC  ||
+                         st->codec->codec_id == AV_CODEC_ID_FLAC ||
+                         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;
                    }