From patchwork Tue Nov 5 03:32:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16106 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 6BBBF44A159 for ; Tue, 5 Nov 2019 05:33:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4574F68AF1E; Tue, 5 Nov 2019 05:33:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BD73689AEA for ; Tue, 5 Nov 2019 05:33:36 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id d13so19911872qko.3 for ; Mon, 04 Nov 2019 19:33:36 -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=NvpJh4eRa4BT1Jd5HKPvrSKPUECG/iC6TuB8sAulguA=; b=uzhb4y/KvT1ywRQRnGyfledRKH2dcAHOHg9UZpWoCMERh6Bpuvxmzz5iJUJtUsc536 2+uH6aWUzfFuYglHjMwTTaUGEBE4PT2rblz9tWkfO0JbNo2FVAW7TRoALQQaK9B/4p54 m2CcCGrhzsZa0CArp0dfxvwjx3b6LtNtd+/IBa/lvyuufrMQI1xXUpaAmGuO1YQwxl6B yBYOl+P3n71Qs9/slzzQtXjXRGqVO/+RBpLVHKPibPuFCmaGG2P9ja2dmDb8XylYLyB0 W2WEzMdgf3AqXA8ms3l6Sa3qjlVJPqb/SqmNI3mfPEBt5zi4plT8F4D1LSnlMBTFI/WJ 8Pog== 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=NvpJh4eRa4BT1Jd5HKPvrSKPUECG/iC6TuB8sAulguA=; b=sBdKjyxcpjXixoY0aXm3W6kGMRjNDB9QSd41EoMkpaXdqbhn5+7XZZvmRMT7usLvTW VAK+zzG4ERyHmQ8bmL+zXyixpTzkf2axUGRiIGTsgAW5tnHhqIbgUN0TcSJPfNcNou4t Vy0oKE1RTEvfgiNx3SrchFAy2+dXwgWGiwvHBoi02RSV8CPX5gr+eefnnv4hXaMlOZhh kbL3s8MS59Dj3hV5PG6chb2FEYCHXy+sh6FWabjTFbiuqKwmAWQHm40Wn92QLD9BsabO Alax7Td4DHGFyAP6X0MLkSNFs1VNDL29mOCznM5jjydhlE/llmMhBp+GGFHEe/HjqhDI p7yw== X-Gm-Message-State: APjAAAWU0OoJLYRXpCKD6iU1r+3ShZs5NzufV8iE5xK/0lt+agDgRChJ FXziwSsJpkICEKKzcjl7MZfjv2fx X-Google-Smtp-Source: APXvYqw/pq0bI8TjDE3/lijhZmKBWqLKRqbKAbvZpoKf4dRuhLn0lupdmTvwVoPulNS3NI/9jEmMgQ== X-Received: by 2002:a37:8a01:: with SMTP id m1mr18231606qkd.147.1572924814832; Mon, 04 Nov 2019 19:33:34 -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 p66sm10857059qkd.1.2019.11.04.19.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2019 19:33:33 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Nov 2019 22:32:59 -0500 Message-Id: <20191105033259.8751-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 Before this commit an av_assert0 would fail if a v4l2 device did not support a target format. For example, ./ffmpeg -f v4l2 -codec:v h264 -i /dev/video0 -f mpegts - would signal an abort if /dev/video0 did not support h264. The new behaviour is to return an AVERROR(EINVAL) error code. An av_assert0 has been added to verify this return. Fixes #6629 Signed-off-by: Andriy Gelman --- libavdevice/v4l2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 446a243cf8..365bacd771 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -811,7 +811,8 @@ static int device_try_init(AVFormatContext *ctx, } *codec_id = ff_fmt_v4l2codec(*desired_format); - av_assert0(*codec_id != AV_CODEC_ID_NONE); + if (*codec_id == AV_CODEC_ID_NONE) + av_assert0(ret == AVERROR(EINVAL)); return ret; }