From patchwork Fri Mar 12 16:54:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26356 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 8ED2444B430 for ; Fri, 12 Mar 2021 18:54:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6938868AABE; Fri, 12 Mar 2021 18:54:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE0E168A878 for ; Fri, 12 Mar 2021 18:54:47 +0200 (EET) Received: by mail-ed1-f48.google.com with SMTP id x21so8892379eds.4 for ; Fri, 12 Mar 2021 08:54:47 -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:reply-to:mime-version :content-transfer-encoding; bh=jbXC1VIeEOWOY37bERa/Qs5mPzfhCypeagl9d1IWVBc=; b=DtAni76ExTSCn/GK144wPYabX6dQNWv0dingQ0F3nRBpzhuUhTRdWXRlwS5aOcp8oz aAThGIUpU/4ijKTByuxhnXC73PexDUfHw/HT3BEg5elW0VLiFYFl00eBpVbCissvt2Ib jFLQ4sM/xb8kz0FQbCa1xpKC7D89ozk/lhZ+xt1BxVPzRqcWyzTnH3X8vT2ampJ/DbI4 3x5L1wUFYiKCu9AwA0FGaMjnLPjQTruBoLpxfZYHYVLhhzrDwBy+0skmBFSNdsAiLEwt kB54Y+UHqWkb4VXAQAm1Z0i/gZDZo9YU4Q91LBxEQLYOAvFJKcwHf8xHggpZ3fDVxkq3 lKyg== 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:reply-to :mime-version:content-transfer-encoding; bh=jbXC1VIeEOWOY37bERa/Qs5mPzfhCypeagl9d1IWVBc=; b=H4J+Jki9Vn7Uuw6weE1JN8RnOk24w459guUp3Odk+08gCChlGpwmusS2DxC3ywbFwo K4N+0yCqUqNhC8n6cxgXJO/xRbF4GJaGN2cNxiQ+IdS07i9owxAMwrTWLBsgbjT2Dj8/ NOx75D+tc5O1QhT7xFUxe4hsOZI+cKmvuY+QJR1P7cBvOnZM0F08zqgL/MLOuN9IUo6w v1BsJTfqTCmIYcWKs6KLkcD77hvnWI5mKxliljalIXmFckrMladxzGqjNhAw89dYxDKv NSFDTJM+f0NxiHBWuSSyc1ShMwkQUVKgoLmeSiL/bQmpy+hQFb86tnj+o1+sOk9qGvE+ JxoQ== X-Gm-Message-State: AOAM531pL9SJFxkpzvNZ5b++rnWAynCMo4YPhfgU26RFHcHZpGsuDS8V Q15IehaXdxKWZz5a/qmFdE9u6IFaqns= X-Google-Smtp-Source: ABdhPJyRRZ5CNv3P9ccxNEPpD8+NWNMoyQGQmbA6gy+GYJFy0yMtpeipKg6GWlBcbi7m5qHJuCPKTw== X-Received: by 2002:aa7:c654:: with SMTP id z20mr4326549edr.377.1615568087035; Fri, 12 Mar 2021 08:54:47 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id n2sm3034879ejl.1.2021.03.12.08.54.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 08:54:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 17:54:40 +0100 Message-Id: <20210312165441.2113452-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: Remove always-true 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" Forgotten in 1fd76277708cf83572ba243e98f9e848c652f83d. Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index c7dbf7b791..73cc3def5f 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1744,7 +1744,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) av_fifo_generic_read(avctx->internal->pkt_props, pkt, sizeof(*pkt), NULL); - if (pkt) { frame->pts = pkt->pts; #if FF_API_PKT_PTS FF_DISABLE_DEPRECATION_WARNINGS @@ -1775,7 +1774,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } else { frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); } - } frame->reordered_opaque = avctx->reordered_opaque; if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)