From patchwork Wed Oct 2 04:04:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15447 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 371B84485DC for ; Wed, 2 Oct 2019 07:17:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC0A8687FEA; Wed, 2 Oct 2019 07:17:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D5EB687F85 for ; Wed, 2 Oct 2019 07:17:40 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r3so17896515wrj.6 for ; Tue, 01 Oct 2019 21:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YtkvY8vBF2cif9es7QaxXs8pgvfH4nWCJNewtVD+X8w=; b=WQORYIync3QHtEBmVt1oX8TyU9eTEScD+cLaY4gDStdT+vbaHbRkBMpRlz2di+k2dg mYXe6xJO5WPOJ+6B91ZmDAfP2uq4cU7hmai6Jb7cZqsA2AH4DL8oKQuk4vPs5Rp1IcT0 leAWVIKP+d2BwwWZtuFJtSgFSAsbykPxxD4U/+ZFmARhBedE1N6VunsX8pquZ2A/tKsz N+r178iCVO6iBKzW9pxbEXhLOecoOgi4oFjZwgma4DKUHSFje1WpQCI0OFm1yoWoJzSJ 5E7VjvoWMRddXqdHqpLI6td3+Fre2ofhb+/m5uYKFT5gb/9x7FPndRDlduvfU22rQ5Di UF/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YtkvY8vBF2cif9es7QaxXs8pgvfH4nWCJNewtVD+X8w=; b=MUDfhPZtME2Byh3Lp1UiHcM61K6RDlliBcObOnTVDH6fkqaqJ6xtYoud7fqKThmwIt ua6Gy7UmFlcWKAdS8DQsGpUXzrevDPFI3XXwpdH8GncnTqh07gaah20RWGvcRv3q/K2B 5zxSDdPP1Y2EQTMyS1m0Jf5lrZelZUCudaS2Lr03aDrBY7+rEgmSEJJfG4ZN68+2YcrO hjd+4XzXiaoucBuJyj1LZBaIJtyjjR3gAVRemdjGehhmckTq5YKCKwisbeH2lQ9eflaa Ff7GnapRb+gg/1zqrfG4qYx9RdXSky9mTCYkbjL4K7O7l/MZJAn5bJ54z+hOSvXX8oKk vpww== X-Gm-Message-State: APjAAAULFyainPLA3cmIoPxHtZWZ/ngT7WsV5oNsUMEA6MqwE/ghf7mX jrEVxoaYxxKSdLC+rtEUqaAsuNbN X-Google-Smtp-Source: APXvYqxiG1aYBBYW9eeakx97U/VaBOBIRbpeqv/s/rxoKUxIweZab9RaZB95lHOcrKAutMeSbAOBYg== X-Received: by 2002:adf:ec09:: with SMTP id x9mr894025wrn.308.1569989445101; Tue, 01 Oct 2019 21:10:45 -0700 (PDT) Received: from localhost.localdomain (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id g11sm5025712wmh.45.2019.10.01.21.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 21:10:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2019 06:04:12 +0200 Message-Id: <20191002040412.821-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191002040412.821-1-andreas.rheinhardt@gmail.com> References: <20191002040412.821-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/aiffenc: Remove wrong and redundant check 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The check "if (!pb->seekable & AVIO_SEEKABLE_NORMAL)" is wrong, because ! has higher precendence than &. But it is also redundant, because this part of the code is only ever reached when the AVIO_SEEKABLE_NORMAL flag is set for pb. So simply remove the check. Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 0b837cd264..d09c9afb95 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -49,9 +49,6 @@ static int put_id3v2_tags(AVFormatContext *s, AIFFOutputContext *aiff) AVIOContext *pb = s->pb; AVPacketList *pict_list = aiff->pict_list; - if (!pb->seekable & AVIO_SEEKABLE_NORMAL) - return 0; - if (!s->metadata && !aiff->pict_list) return 0;