From 0d2a62d25719371215c0f13a850ae7fe442ba013 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 12 Aug 2015 22:18:58 +0200 Subject: [PATCH] avformat/avidec: Simplify dshow_block_align based special case detection Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index d9427f543b..3881251a78 100644 --- 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; }