From patchwork Sun Nov 3 16:08:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 16089 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 74AAF44A717 for ; Sun, 3 Nov 2019 18:35:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D3F768ADE9; Sun, 3 Nov 2019 18:35:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f42.google.com (mail-vs1-f42.google.com [209.85.217.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B685268ADDF for ; Sun, 3 Nov 2019 18:35:13 +0200 (EET) Received: by mail-vs1-f42.google.com with SMTP id k1so9544826vsm.0 for ; Sun, 03 Nov 2019 08:35:13 -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=76CQxeNMzj1t4AHFQzg3KtxwXzHa1+aW2LiEOQ044D0=; b=W8RYpyqtpSAe7p0DqG+WZPCGyY8B6ns5Pocdh7aMvQdrdMORvDmjhT49an5MoOIuqU j3NM6fpqqCWfIQ9ZaM2zpXLkdQvhqJXGXaSixUstBtFVIdheqO8PqbkjufKUAckp/Ak8 G3Efwz44lra3GDCkXI2T2Au1ikq8Q5sM4q70XvpXOm9NVxqWcCIPwfDyIgn/70Y/0Pdc zthzb8tJ0bmRQYs4H7MigI935e0K+YVvoxUg3fSX2x/HgN+iOiirXydrLHM0DIuWq/iD jXTvjJ7RNmhIL1xMeo64VJ/Y8HkIS/HHmnrLKRBPddmvq0Vh60k9EKA0KMUYbaJ6Djaf f6GA== 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=76CQxeNMzj1t4AHFQzg3KtxwXzHa1+aW2LiEOQ044D0=; b=nXgrt2Kdfs/dyA2LBzyy4xg6E8/g80t4DJbZyzAI2R3b4Ztms3NiGqPtAzyi7xJN2I +a4rIAbQmgfigxkc9Jpd4XoiGzV1BFa/tvh0FklJCCHeAvXQ1xVioBsz5TGX1Nkhsxen jW24JtEYVw+VAtu7OXsspIpTnRuwwVFQqCVUdTdQFbtnc8U/0wNfKdCcJgZ5/u13wyCB +e2tiadLvYhxc71hxCNopAmm1IHx4xfyKaIqs1P4Bnn00QTXfQF2SHrQfMn0xE2D24cc FDxZC+UmMGwg3AzQz1L+4mUj7fe2eVBC3iVstf9ruUco7PINnsRcra0cMK2Spcw/YWqE iSxA== X-Gm-Message-State: APjAAAWUbpmDL+1wDNCf4h5n4HbBzkAWEAmje5EFd9P2aIiXkJgT8vWC iQfyOfCgQcQqFSf6RUCc80C5BfGO X-Google-Smtp-Source: APXvYqxy2yj8809H2GiKZfqmTqfzceLfPHGg7a6ydo+B6+5DRDL5o4tF7Xz6kyKWn6wVmMvinATy/A== X-Received: by 2002:a05:6214:1812:: with SMTP id o18mr19266669qvw.33.1572797339540; Sun, 03 Nov 2019 08:08:59 -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 y10sm7854835qkb.55.2019.11.03.08.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2019 08:08:59 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Nov 2019 11:08:41 -0500 Message-Id: <20191103160841.14872-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avdevice/v4l2: Change assert type 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 Currently an av_assert0 is triggered when a target format is not supported by a v4l2 device. Replace by av_assert1 to fix this issue. Fixes #6629. --- libavdevice/v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 446a243cf8..05a8d3d337 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -811,7 +811,7 @@ static int device_try_init(AVFormatContext *ctx, } *codec_id = ff_fmt_v4l2codec(*desired_format); - av_assert0(*codec_id != AV_CODEC_ID_NONE); + av_assert1(*codec_id != AV_CODEC_ID_NONE); return ret; }