From patchwork Thu Apr 13 14:12:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1289623pzb; Thu, 13 Apr 2023 07:19:29 -0700 (PDT) X-Google-Smtp-Source: AKy350bBJD3hQvLtY4dJbn0o8t6PE7M/a+izdJcgpWiafjlScV2YXC9QrCKE366wK+CEgpWS9DHN X-Received: by 2002:a17:906:686:b0:94e:1069:151d with SMTP id u6-20020a170906068600b0094e1069151dmr2927504ejb.10.1681395569564; Thu, 13 Apr 2023 07:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681395569; cv=none; d=google.com; s=arc-20160816; b=GZTH1IoccHp5UaraLF6Kgz7DVLyRx1hzSHg1QPt09Qz1JV37quTiRQIheZq2xj6TSw iAjzGZBBzuDsJvxDlMLsV0H9c9Riw+bfDXPshBHL2VqRLZMA2lF+Tgzzf2n6ra1OPFVg pNW79nisM9rK9Og7empG2n1nk7bJnEMKQ18GGMOji/PXcL9uZi1O0qDC9GkhH+VLZbpk 73PJSMXVbqECSw9fo7eA6hEHxarbpjicRbJfyE7SeOkqzJqQv6lU72nnCukODNL8NaFW eP6JjzuzRNv0BX2O2L/pzrVuIzJ+Qafoaq/E+fucwmAYbPWNaMfyy/dJGWeP5LPXt/7d 9NTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=sgDmmqNnWar36B9N3lIkXsMCRTmHuDsvg1aMZ7CC5Fo=; b=rFRfig0TCV0XmBC7SMyiSBscD96EEB1I8ROfzSXtz0PRtgOpPYiveo8qe3NC9ewTuV /CoYuYvlaSBy7/t4Q/Wm+YHC88i3Y+S6xqapIYDyQlNQY0bA6vE4zy1wwE8jQoi8qpr9 yYE8rV6VFOhlLGtaF8GS5u185o/oCAG7eX3zNTBK4hNNYtyBGSnO9sA8T7P7xKknCS21 Nt+G25F4gZZMdFOfrtiVCUSmbaehrY6ZI3yEgs+WURy6gKLVcVJi2HRa5FsF+OW1Ritj 6zdKGsCsj4KjGbxYDSiK5tTrNsVcQnB7AYCiYMdhQjWcnT1RhBhq978ayveDby0FVHXR ZF+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d25-20020aa7d5d9000000b0050679ba247esi251161eds.497.2023.04.13.07.19.29; Thu, 13 Apr 2023 07:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E12A268BEDD; Thu, 13 Apr 2023 17:16:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48C6B68BE48 for ; Thu, 13 Apr 2023 17:16:00 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2D3382406CA for ; Thu, 13 Apr 2023 16:15:59 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id HJyDJUmf-QoT for ; Thu, 13 Apr 2023 16:15:58 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6F4142406CE for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5EF253A0404 for ; Thu, 13 Apr 2023 16:15:53 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2023 16:12:11 +0200 Message-Id: <20230413141223.17245-13-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230413141223.17245-1-anton@khirnov.net> References: <20230413141223.17245-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/25] fftools/ffmpeg_dec: drop useless abort_codec_experimental() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 6lxSwjrwcuGd It does nothing beyond exit_program(). --- fftools/ffmpeg_dec.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index d6fd0de126..658e7418e9 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -27,11 +27,6 @@ #include "ffmpeg.h" -static void abort_codec_experimental(const AVCodec *c, int encoder) -{ - exit_program(1); -} - static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts) { InputStream *ist = s->opaque; @@ -123,7 +118,7 @@ int dec_open(InputStream *ist) if ((ret = avcodec_open2(ist->dec_ctx, codec, &ist->decoder_opts)) < 0) { if (ret == AVERROR_EXPERIMENTAL) - abort_codec_experimental(codec, 0); + exit_program(1); av_log(ist, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_err2str(ret));