From patchwork Sat Jul 13 20:25:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 13933 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 04C76449E12 for ; Sat, 13 Jul 2019 23:32:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEDD468AD60; Sat, 13 Jul 2019 23:32:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4779B68AD56 for ; Sat, 13 Jul 2019 23:32:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hmOb1-00080A-1X for ffmpeg-devel@ffmpeg.org; Sat, 13 Jul 2019 22:26:15 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id mOa2hcg425D5NmOa2hKbN2; Sat, 13 Jul 2019 22:25:14 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=UOWTkKyxPOYyIot8DFsA:9 a=cR0iiHL8oXSiIjt1:21 a=BJzDqUR61U6DtG11:21 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 13 Jul 2019 22:25:01 +0200 Message-Id: <20190713202506.14871-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfCUkEIMJVxB0520tRks04qAPZ8cyupH8ks3yUSsunZ/avC1UisFjpSVbFe0YzJh0bZ4sFuz7idjYXrj7Iq07QyXuUJG8/s/wr391J7RgahKrWtqLDItV lkWTRsALg85aJY36yDW47KVg+UoFePoBNwSKDHedkEoxBbS3qM6HCqpM Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/iff: Add "else" to make code look prettier X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavcodec/iff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index c6e2359b00..7f1c589d7c 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -284,7 +284,7 @@ static int extract_header(AVCodecContext *const avctx, if (s->bpp > 8) { av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u\n", s->ham); return AVERROR_INVALIDDATA; - } if (s->ham != (s->bpp > 6 ? 6 : 4)) { + } else if (s->ham != (s->bpp > 6 ? 6 : 4)) { av_log(avctx, AV_LOG_ERROR, "Invalid number of hold bits for HAM: %u, BPP: %u\n", s->ham, s->bpp); return AVERROR_INVALIDDATA; }