From patchwork Wed Feb 24 11:53:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25954 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 5D46E44B5C7 for ; Wed, 24 Feb 2021 13:54:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4285E68A32E; Wed, 24 Feb 2021 13:54:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 507E86806EB for ; Wed, 24 Feb 2021 13:54:21 +0200 (EET) Received: by mail-wr1-f53.google.com with SMTP id n4so1631521wrx.1 for ; Wed, 24 Feb 2021 03:54:21 -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 :mime-version:content-transfer-encoding; bh=4DsW72wOCPY7IZxVhW58ti1y9CaidAW5k1z36dMxBmU=; b=Aqm8SJRj47OJVE2VLjB91bUnh2ZFDkLdAG24CsRvG0bI5eIXwDro7fa3d7mM6hUnWP XrFKuT5tfKZ2S7O6tbHoiD0IAWiory7mt9Yb3w5XdgkZ7w5/U3kHPC6WtdgU0/2o92nT ou3Mjf+pKAyY91I/yHNwf/GRC/aRNdRNRk9WzzdrHy7N9XK+5XEcBJzGgPEQHtGAKiRI wC73D79Zgh9dHkbbExClidjJ+TDTJ545X7aDmFwxczATZIwMQPP68ZFF860x/MjCMrQK 4xGWDh8236yeSQ1jh77Dgq3o/ykb0Ql1Jk+cOEU57AqvZzhxfzB/m3PIWeIU+FSgPKZU Vr/g== 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:mime-version:content-transfer-encoding; bh=4DsW72wOCPY7IZxVhW58ti1y9CaidAW5k1z36dMxBmU=; b=ANzwahkToZ77fmfuYl4OswGk/tmoVxBQUM3qpnp53kF/KPWRXExRBi+bpBDOnfoQIK hlDwmMvsJEt0dlZEVmOWwdqzGMeLta87c5frA4TYVRKLozQuqv/uh73BZ7lua4bGXqgj OIgsELbdBG2O2QZeqP5BrVYBu3DABqqfbJPmQ3WHiafNvpPWEJGH22tYC1KnXoMtGxQ1 HthONo9gvU2sKZpRVlkH4hAI6s3FPZdPTbPDaQaXCKFosEhDrHV6iYhi6s6sB/7wPgpo fXtYpuEsgAQFQKPpwJu4C55wWSCscVV1npqmpRWJM/EIWaVqWUxAWTsA4V0KN/pn6LMF /ZAA== X-Gm-Message-State: AOAM533iqNm2YE3PhkM3M63NyAnmLPZjeGnkzbwb+8SIHUyG7CzvztPx XjlnjFNHBXo71uwNjSQS1tMCOEFMlGA= X-Google-Smtp-Source: ABdhPJy1F+FtkT7K3u9DTmDst1PQpbTMDD766LyYR7de+36PrnmKjIh6ONKNaWcQAUOfMN0ISX78tQ== X-Received: by 2002:adf:b313:: with SMTP id j19mr7862795wrd.188.1614167660501; Wed, 24 Feb 2021 03:54:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:20 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:29 +0100 Message-Id: <20210224115341.794293-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/15] fftools/ffmpeg, ffplay: Don't set refcounted_frames 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" It only affects the old and deprecated avcodec_decode_(video2|audio4) API which is no longer used here. Signed-off-by: Andreas Rheinhardt --- I am surprised that no one found this before me. Is it because there was no -Wdeprecated-declarations warning? fftools/ffmpeg.c | 1 - fftools/ffplay.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index add5a3e505..abf35150bd 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2957,7 +2957,6 @@ static int init_input_stream(int ist_index, char *error, int error_len) ist->dec_ctx->thread_safe_callbacks = 1; #endif - av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0); if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && (ist->decoding_needed & DECODING_FOR_OST)) { av_dict_set(&ist->decoder_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE); diff --git a/fftools/ffplay.c b/fftools/ffplay.c index b9a30cdb11..ac0885b84e 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -2628,8 +2628,6 @@ static int stream_component_open(VideoState *is, int stream_index) av_dict_set(&opts, "threads", "auto", 0); if (stream_lowres) av_dict_set_int(&opts, "lowres", stream_lowres, 0); - if (avctx->codec_type == AVMEDIA_TYPE_VIDEO || avctx->codec_type == AVMEDIA_TYPE_AUDIO) - av_dict_set(&opts, "refcounted_frames", "1", 0); if ((ret = avcodec_open2(avctx, codec, &opts)) < 0) { goto fail; }