From patchwork Tue Jan 26 13:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25194 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 D93C4449E04 for ; Tue, 26 Jan 2021 15:21:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEB476883C8; Tue, 26 Jan 2021 15:21:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADF0C687FA4 for ; Tue, 26 Jan 2021 15:21:35 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id m13so1999235wro.12 for ; Tue, 26 Jan 2021 05:21:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=izMYI3nkBpnxVxFgUvwKdrsYu7X56gV/0qrIPL0S6GI=; b=eEcCwKVN6qMQtpyl+428KfPHQLumgmiDSPJewK5KfUGukWCKdqT91Ff0mUZ7DX8RKE NwDrg6wsSoI515ipVFydlDL0SH9Yt0o/rnupkOzU6+5PbclL6vVXeu7hdzywUkQ6qGpf +g/uP4FkmVTv+Yb4wopd5a9aptJAXIC8nmg+I5vvUn5qCR3YZ5FXzwMT//h25zlBSCI8 GmTUK+CCwMreUpQIGxB/YluSqn2w/n9875vMH7jHTpYjqzMDINlpv3zME06fibtoVsgi ZHp1i26kM7sZpMVd+aHX4FWGwxGzjGkYYz7IfM1wOhSehebcC4O7uEDiCAX4tYGTQS5m MjUQ== 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:mime-version :content-transfer-encoding; bh=izMYI3nkBpnxVxFgUvwKdrsYu7X56gV/0qrIPL0S6GI=; b=qvLN8K6kXvuEQn0yL3+yOZnPRc3A4UHaZA04hQ8tqXMLhJ8greSIHEG5khUeIPFRGp rSxsMNhVOSg3Axrxqi8XKZLaLRvTkeTeCuZRmvp/uqxq/oOrPLInY/qF+Zm9eV1XH+ZS OCOJm3M+AT4NXpGb1DnW26vSe2498q0buzj6qesuF4lezw3vKSU9/kMYA+/6dkjJM9k2 3dmQOcdXULRQG381opIwPqR1EEzwAYcUYZBnuGNM4PsYnaHfbx/FNuSq+/xxB+0jZjCn e5xu+Bd+XCLnwCCZctJ7YV31IGvFsM+e1P9ljvgUrc0wdQkaL2pSGze/4qA7lZzM6f6Z 8fcQ== X-Gm-Message-State: AOAM533ipwc1bm4tFfpbZpslnwI8uYrII+tL4cKZcVB8WetJVYA+/Uex +rR2Cz/G9VqVKRegnoSt825Q6HoC7uQ= X-Google-Smtp-Source: ABdhPJx5WrT0/QOhZ6i5axNniYbh5vVhlqUrY4gFoUHO75wNj9mT2NJXD0+S87NM6+iQ8ltsaW2S9Q== X-Received: by 2002:adf:d085:: with SMTP id y5mr6221089wrh.41.1611667295036; Tue, 26 Jan 2021 05:21:35 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id a27sm27563697wrc.94.2021.01.26.05.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 05:21:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Jan 2021 14:21:27 +0100 Message-Id: <20210126132127.1802120-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avidec: Simplify compile-time check for DV demuxer 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" 1b373b41d940e3058cdfb3d17703e23ed665353c made it a bit harder to find out that a call to avpriv_dv_produce_packet is dead when the DV demuxer is disabled; too hard for GCC on -O0. So simplify the check a bit. Signed-off-by: Andreas Rheinhardt --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e92a449969..79000f3e81 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1483,7 +1483,7 @@ resync: } } - if (dv_demux) { + if (CONFIG_DV_DEMUXER && dv_demux) { AVBufferRef *avbuf = pkt->buf; size = avpriv_dv_produce_packet(avi->dv_demux, pkt, pkt->data, pkt->size, pkt->pos);