From patchwork Mon Nov 4 00:57:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16091 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 0362044A10D for ; Mon, 4 Nov 2019 03:03:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1F9368AFAD; Mon, 4 Nov 2019 03:03:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE3D968AFA6 for ; Mon, 4 Nov 2019 03:03:10 +0200 (EET) Received: by mail-qk1-f196.google.com with SMTP id y81so16006814qkb.7 for ; Sun, 03 Nov 2019 17:03:10 -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:mime-version :content-transfer-encoding; bh=XGE7r2lLm6dU9YmeGnjdogJoFCWWz1CmXS+lIABOejU=; b=eyhFWOJG4ab2Wlcth4PhmgWX58Gs6wuTROd0/Rxq8A5g6SATwyPDJoawsYXS8uzE7B L0uQjXIu2va5y0W8gO7qqVLP9VABdkl+F3fYhqzU42ZN2eVItRISM3ArNAOiOsbRAuWw APFfCDzwUzUXl8UyryKpBkd1jpMCKi8x2YYDwJsCJ+CNb3ojfFjBPtw5VZlHMcPGs1K+ QjDCIzAwJHmyBk6jaHNlzymxT9oOmZDQLoicuJ6kI6w7AU5D8E8IT2rsHdClicJruH6l J2S+xs7OUe2/yetH/6XTYLqKfnfzYe/LZiIKSHbC0PzYbO2M9FvKLfunFZdk5GZc3tBY PiFg== 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:mime-version :content-transfer-encoding; bh=XGE7r2lLm6dU9YmeGnjdogJoFCWWz1CmXS+lIABOejU=; b=luasdgcFbhG2Vy0UqL7wOiCIcQi9ze+yZ/RUHNEvAWad51v9OYYCpf04LqFTJexgam s+dEmErx2DewITsyh5bPW88A1I/TRPPATECtz9UtkpBGLQkcKuPYP5fDmXlzwCKUDFpS zh+OJsUvqKsgiEZjbg4eqz6erxcpTbW/PfqOeIMhnaV3eweWQJ/b1P66QzOG+xBpHToW EgXpcBm3lceMcu9C21xO5x9Cz8rY7zBe+mWsFp6HgoKVnROAYPSkVesFTO31iO+hefDx 7QtUXXzAm2+HOCJqU1XFNnxSmraQAEwrnvRo4UFcY+lPrp87j7MUsdX9/LYw3ftxY2VO KvKg== X-Gm-Message-State: APjAAAWHgz3JdkwKq9UygsLHnq5M6pZYTWdfdNSs2dD5VWcfSsNtyolI BJpGz26pprX0uVoBXNG2XvCIuiN8 X-Google-Smtp-Source: APXvYqxCCIfPhWAWow7fy3d+Rac6nRV/qsPBny1Gw99gy+GVZpiQP7C5Hbxjf3VhxYaFwjI3Wlq5ng== X-Received: by 2002:a37:e50d:: with SMTP id e13mr20318193qkg.288.1572829073293; Sun, 03 Nov 2019 16:57:53 -0800 (PST) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id r6sm6293308qtp.75.2019.11.03.16.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 16:57:52 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Nov 2019 19:57:23 -0500 Message-Id: <20191104005723.31954-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avdevice/v4l2: Remove av_assert0 when format not supported 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman This commit removes an av_assert0 which signals an abort when a v4l2 device does not support a target format. For example: ./ffmpeg -f v4l2 -codec:v h264 -i /dev/video0 -f mpegts - will currently signal an abort if /dev/video0 does not support h264. The new behaviour is to return an AVERROR(EINVAL) error code. Fixes #6629 Signed-off-by: Andriy Gelman --- libavdevice/v4l2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 446a243cf8..a6ba015a86 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -811,7 +811,6 @@ static int device_try_init(AVFormatContext *ctx, } *codec_id = ff_fmt_v4l2codec(*desired_format); - av_assert0(*codec_id != AV_CODEC_ID_NONE); return ret; }