From patchwork Fri Mar 19 02:01:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26462 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 117C044AD45 for ; Fri, 19 Mar 2021 04:02:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D946C688128; Fri, 19 Mar 2021 04:02:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34814680A43 for ; Fri, 19 Mar 2021 04:02:12 +0200 (EET) Received: by mail-qk1-f174.google.com with SMTP id c3so1422795qkc.5 for ; Thu, 18 Mar 2021 19:02:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8EgI9vOM002HzMKrd9w+A9HPsn/Srbt8ldxSJPFbTPM=; b=I0e5TYbGWD5c488nXatItTGaFTJDd7cf71RgLTl14nMBYbM/hz2QqC1X4E+QhI6Csm AUG8g1v0+wSevYkVtqkNUd4/2CA7mIZsvfCFWh0lxEFnATd0o4j5dfbnkFh9N3bXkPiH QNUrWyyhjwQdYL6WWVP355lJ+13Vhf48n11sZgP03TfIuwGjx5o+tXBbzCzRD9Id7K46 8lbWMoMyTB9rEAwEk2ZdhrCu8QA9n7r/G+HNIS6g756jifrc9arb7NB2CMm3diYekbW3 2bwphBZWv5fDtBRuvyc+y+nz01Vv2w/ulSq2cpRP95KQZ9ChIKhP3fgNiK1OJo2KXLSD sFEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8EgI9vOM002HzMKrd9w+A9HPsn/Srbt8ldxSJPFbTPM=; b=MjuMSNOlQCM+QKNQ//rkZX0I9XNwfOZGi5pcw86sca4CPy31uuWlWSi2U/NTA7gB6/ ZInBN8IQuKBjADBFRQW+/bSRQQ58QvbQnVC6FwlGim9bARXfe0ODH56+0VZ2139Jyemg BIOvHgE6EiIPUuKaHePu+dIW48GgR/Hr9kYCGYF2MLdFURG00a5kYD+E8rokO//EBzMC xHjqKbLE+4FJxG+hOtCjBhmwfwd/MRT97pMLG2QwcOet0DdVKZjT79WQglSfQGesjOa1 ZoTx7RMyH7M0oMkBBFeK/aFJv4YUqCUUpZGyDAZBQ3ax1NruN9U0XubqhWQMrMs0KiWd b4Iw== X-Gm-Message-State: AOAM530d4Bipo/tpShojlTRxRTIt2RFJxA47zyjPpa5czywFqVc0TjFJ ppeRmxi7bBQp/5nu26kQh6jjH5P7oac= X-Google-Smtp-Source: ABdhPJxlqgB+J8tnwsIs85ryNpqvtgLPfESLjymwD6B9S/hnjBoOBBMzPbzkoK4ftGeQr67rK85Qxw== X-Received: by 2002:a05:620a:b02:: with SMTP id t2mr7594583qkg.128.1616119330490; Thu, 18 Mar 2021 19:02:10 -0700 (PDT) Received: from localhost.localdomain ([191.84.255.89]) by smtp.gmail.com with ESMTPSA id p8sm2832108qtu.8.2021.03.18.19.02.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 19:02:10 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Mar 2021 23:01:57 -0300 Message-Id: <20210319020157.606-1-jamrial@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libxvid: remove unnecessary output packet data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The user buffers passed to avcodec_encode_video2() haven't been propagated to AVCodec.encode2 implementations since 93016f5d1d280f9cb7856883af287fa66affc04c. Also, the generic encode code already unrefs the packet if nothing was encoded. Signed-off-by: James Almer --- libavcodec/libxvid.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 50601807a7..cb9135436a 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -738,7 +738,7 @@ FF_ENABLE_DEPRECATION_WARNINGS static int xvid_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *picture, int *got_packet) { - int xerr, i, ret, user_packet = !!pkt->data; + int xerr, i, ret; struct xvid_context *x = avctx->priv_data; int mb_width = (avctx->width + 15) / 16; int mb_height = (avctx->height + 15) / 16; @@ -866,8 +866,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } else { - if (!user_packet) - av_packet_unref(pkt); if (!xerr) return 0; av_log(avctx, AV_LOG_ERROR,