From patchwork Thu Mar 4 15:42:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26093 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 6652A449EC7 for ; Thu, 4 Mar 2021 17:43:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A71E68ABAC; Thu, 4 Mar 2021 17:43:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D78386897E3 for ; Thu, 4 Mar 2021 17:43:08 +0200 (EET) Received: by mail-ej1-f48.google.com with SMTP id dx17so22673031ejb.2 for ; Thu, 04 Mar 2021 07:43:08 -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:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=RedLFedI4b3rTYy8DxfRvzFCdnEUKOEDg5A4EfQgzFQ=; b=AWQy9Lnmr1W9EmxUWi9w1DhcUlGdMj0Qy34ZaLU+7a9IR49Kfl+xQdguZWMoFrxHve HvUkG/Imq8upBkrq5i+36GakYBzdAwpDv2TXcaky081FomQTbs6IeK9I0J0vBojeJ+vM niy80o0ECA7FPbqM41rYq4HHLofM1ocTBrS5CW6if6qacJBMU6/oBszqTlt4rcUYZXFB LxlU7UUwyNcBzF0rBIdTravkMkiU7dB9wFBUDoVJvRMeH3DDKqwUBbJcB7LKeu8gZ5TC olZ4tFaQoNl4wtxVDjQnh628wHPR2UUHErtIKG0LyvHyaUJ7ZNjRz1ngF1LJ7pLoAIc8 On1Q== 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:reply-to:mime-version:content-transfer-encoding; bh=RedLFedI4b3rTYy8DxfRvzFCdnEUKOEDg5A4EfQgzFQ=; b=VC4WhsEgRUhm8BTHCgDi5R+ys4GDmiFl9dzPxr0Ek7zRLtBivcd+gEnMk1zU/kkKuY EGrVeonP0Y+EcTgUfl790erR8S9HmeJyNdiI6Hq/sjp9cUW210oNvL/hpLkfMAf1rx9k pda2/LspszMOB38v/yylLvsKz5qigI+BnWO+wybVCOzeDjhugbaMD7+xTM0m7ZKsD2jN 2uteyJxq6/OHaMj3vjKpTROPLRX1PoM0UB/TfIpVHNR5BXD9Tt9G+zbGXR/lUNh70DDQ iVaC5GuIusxFP3s9jAlHwsnuGUW/Oy4S6hpTbSlmOj6bsolNjUmNuygx1dUI6UIZPHFD CVNQ== X-Gm-Message-State: AOAM530D7IDTPEfxVgzp9hwLTVeyqVE9nxXSr42W5TBpbtILKEpWzbbG v5hO5haAipucXq2yXwytsrMAf/yKL0I= X-Google-Smtp-Source: ABdhPJw+7vTLlrkBccvyW2Tk58edk6Be8P9C4axPick38iLol/kz+hXfTq/+3H85Tb1Ci3/qoucNlg== X-Received: by 2002:a17:906:ae96:: with SMTP id md22mr4735323ejb.409.1614872588182; Thu, 04 Mar 2021 07:43:08 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id y24sm22673391eds.23.2021.03.04.07.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 07:43:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Mar 2021 16:42:31 +0100 Message-Id: <20210304154233.934640-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210304154233.934640-1-andreas.rheinhardt@gmail.com> References: <20210304154233.934640-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/decode: Don't needlessly copy side-data for subtitles 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" AVCodecInternal.last_pkt_props is not used when decoding subtitles; ergo it makes no sense to set it at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 84c4039836..04cb050dc7 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1050,10 +1050,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, if (ret < 0) return ret; - ret = extract_packet_props(avctx->internal, pkt); - if (ret < 0) - goto cleanup; - if (avctx->pkt_timebase.num && avpkt->pts != AV_NOPTS_VALUE) sub->pts = av_rescale_q(avpkt->pts, avctx->pkt_timebase, AV_TIME_BASE_Q); @@ -1099,7 +1095,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, if (*got_sub_ptr) avctx->frame_number++; - cleanup: if (pkt == avci->buffer_pkt) // did we recode? av_packet_unref(avci->buffer_pkt); }