From patchwork Fri Nov 15 15:56:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16286 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 7EB82449B21 for ; Fri, 15 Nov 2019 17:56:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5BB9568A215; Fri, 15 Nov 2019 17:56:55 +0200 (EET) 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 18E016897E2 for ; Fri, 15 Nov 2019 17:56:49 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id i12so11521564wro.5 for ; Fri, 15 Nov 2019 07:56:49 -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=8WSoguF013+h6FRrd6NyYGKIkUF7qX2u562c1HczQX8=; b=b7APTUO9LDdvpN9WkJCtO0mcMbu4wmfbkydf0wsIphLS1cdssBQkXWhNdZyVEOfMyF 1DUiV3bGlVSyW6ky6iQIJvDXNGMhZIDUktDP8E6vbPGR2iEz+38MfJ/1O2HDCAaOKjhs SC5pIOgw8T9eisCyUHc8rejMLsR/i/G9Jebqh9dx7G+MkMFHqiAWjPZGux2MMMSHJela LpU92qaIm9ml6H15H6p+xDCRyB6xaOXsvtZuzDAm+SLar+OSlLWeH2eipyHUqJZJGwCb ut8jgdO8YpYGixeUqwqZSJurb2lC4B/52B+l2WklWSMiQ0SaLLhiPiOIfTRWYj49ujyp gpbg== 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=8WSoguF013+h6FRrd6NyYGKIkUF7qX2u562c1HczQX8=; b=B0tl17Wp+8Ngs4bsvK+nKfTW6Y5Hdt8xrHxlansgy8ibKHZg/BAKtjFPRud3ErRr5f HdNNDP0tlBi0HFITx3qD67mqgXMndgXjYKtB3O9Ixj0TqlEpBbMH8KBd/KiDJf52Sdgx K1qYk1CkPS+0siGDd4cUJWisk60XoRwMrvELnAbTfjYfBxVgBN9uzFqvZz3/IpEEv3yK RaDcdmp71cYl3if4FpKC27EkkcnLssFoDvUXMEld6eKi8JP5WK4zpteN964esfrn7/Zq kLXsfOKki1cRe7jRF/0vMjrkIiamxUBsjHjUPv6kfTsjk9ltwogou4DKaE9H47e+Hidg +NbQ== X-Gm-Message-State: APjAAAVExJIRJEfnrthhCpe64/3UM1krXO5M3z4DZv0kuRuqguazjj4Y cOGquKijiD2b9nE/rJugWv86yEaq X-Google-Smtp-Source: APXvYqw8YoG8CdAyTKadoPBxFMGD6casKZplVSFh4VTksa/+PAd2iI+Dju+qPYwodFZXPVfajmuSLg== X-Received: by 2002:adf:f744:: with SMTP id z4mr5009124wrp.205.1573833408430; Fri, 15 Nov 2019 07:56:48 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id z17sm11380916wrh.57.2019.11.15.07.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 07:56:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 15 Nov 2019 16:56:37 +0100 Message-Id: <20191115155638.21395-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Simplify flushing bsf 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" Since flushing can now also be signalled by sending an empty packet (a packet without (side-)data), it is unnecessary to explicitly send NULL as packet to flush the bitstream filters. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 27f68933f8..ccadabe83f 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -853,7 +853,7 @@ static void output_packet(OutputFile *of, AVPacket *pkt, if (ost->nb_bitstream_filters) { int idx; - ret = av_bsf_send_packet(ost->bsf_ctx[0], eof ? NULL : pkt); + ret = av_bsf_send_packet(ost->bsf_ctx[0], pkt); if (ret < 0) goto finish; @@ -873,7 +873,7 @@ static void output_packet(OutputFile *of, AVPacket *pkt, /* send it to the next filter down the chain or to the muxer */ if (idx < ost->nb_bitstream_filters) { - ret = av_bsf_send_packet(ost->bsf_ctx[idx], eof ? NULL : pkt); + ret = av_bsf_send_packet(ost->bsf_ctx[idx], pkt); if (ret < 0) goto finish; idx++;