From patchwork Sat Jul 22 19:29:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 42915 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be1d:b0:130:ccc6:6c4b with SMTP id ge29csp1019317pzb; Sat, 22 Jul 2023 12:30:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPuE6g3Ol9VIiYh5MUWCURJeXLmuQDpJxynnzEV1NU/M5ocqyRrUD05RBME0DGtl75Cx2B X-Received: by 2002:a17:906:30c5:b0:98d:696a:531c with SMTP id b5-20020a17090630c500b0098d696a531cmr4803162ejb.40.1690054233572; Sat, 22 Jul 2023 12:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690054233; cv=none; d=google.com; s=arc-20160816; b=A5Dsw8xc4c7hZtoU80zgrfthcpqjs6rkBO0Xky+JPzRYfFINA6eV1j5StNViEioX1K MzomS/0ODSojBfwY5qpjVDd7yCwPRx5o5lkLTRK5ZNPl6naJBGHz+A5gKtYPjvmR6Iqp vI74K1UHzjKfpp59uzSCA5uadbwzf2x1x9yKp36++6ve1Jm/sMjxgsfN7hJwQ1Blhj7p I2atRNL0e2b1Jab0QKZb7YkWVIF+P4uEK/ctuiETz5X+ON3Aav+uGDPcU9mj4o7+2SN2 Qm8BjJiPQXvOkLYj1X+7YY45HuLKGzVG7Ftu9avxeWmxb+trRL9EQkRItPPZZEin3w55 gXjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=+MV9o7vb06HOYN1Vm0TE8H55ednwLZKZRKWE5gk7qZI=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=X10M92iZexUxnDkRDkihN04GNlxkY+BlC9/kv75l9j4Sd3TnDXa08huluzw5UnMMrg U7rNki5Kbl5Q+WzwonvB3k+W4oC+uSVlu5ASFpJBVsvVEeJObgQ6uhelUlnr5/bnxTHE 3FqtDb7RCz0rD7onQVbKmJgHjyg5G2khswdgzbqX4SfZFv3vIXrCFXHpthpM8ISbV5o7 xtoVk0T4snU31Q6WPqN7VpFTbDFpWJytChgZ1J5Yg9TwI2aqsvsmQDZEK23BpGo127zh /rc/rWnHt8f7xtkWzYfk8Rjnvtf2E05j/BYtgECV8RTDU30+k7WYT1/e575HykLuRun2 NY/Q== 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 ke3-20020a17090798e300b0098df1cbe2b1si3961320ejc.925.2023.07.22.12.30.33; Sat, 22 Jul 2023 12:30:33 -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 1C61468C67D; Sat, 22 Jul 2023 22:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2090B68C640 for ; Sat, 22 Jul 2023 22:30:03 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 470A160008 for ; Sat, 22 Jul 2023 19:30:01 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 22 Jul 2023 21:29:55 +0200 Message-Id: <20230722192957.703-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230722192957.703-1-michael@niedermayer.cc> References: <20230722192957.703-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/6] avdevice/utils: add test for AV_CLASS_CATEGORY_RADIO_INPUT 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: N9ldasTjVKPa This avoids keeping diffs for libavdevice in the libavradio repository Signed-off-by: Michael Niedermayer --- libavdevice/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/utils.c b/libavdevice/utils.c index d9a52c53ab..faa24fa74d 100644 --- a/libavdevice/utils.c +++ b/libavdevice/utils.c @@ -33,7 +33,7 @@ int ff_alloc_input_device_context(AVFormatContext **avctx, const AVInputFormat * if (!iformat) iformat = av_find_input_format(format); - if (!iformat || !iformat->priv_class || !AV_IS_INPUT_DEVICE(iformat->priv_class->category)) { + if (!iformat || !iformat->priv_class || (!AV_IS_INPUT_DEVICE(iformat->priv_class->category) && iformat->priv_class->category != AV_CLASS_CATEGORY_RADIO_INPUT)) { ret = AVERROR(EINVAL); goto error; }