From patchwork Mon Jan 13 04:11:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17313 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 46471449F25 for ; Mon, 13 Jan 2020 06:19:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C05568A6C2; Mon, 13 Jan 2020 06:19:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C414F68ADB3 for ; Mon, 13 Jan 2020 06:19:01 +0200 (EET) Received: by mail-qt1-f193.google.com with SMTP id k40so8007817qtk.8 for ; Sun, 12 Jan 2020 20:19:01 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=YH2qD5xXMXd9KWQRNnJdLAUzO7MmSKChP3VSVtptyAc=; b=LJ1b/nFdkhXMqAAXna5x8I9VM2PW8T8bwkE6L2CLZfoymmY1VxLawBbRYLhQyU7moQ rX5uvloOJ46UYpbgblNEwVxWtM4oqKwV4WgwleI30AoFZS6jUknbSQRdD8XV344fVFyW 9lxWKqV6FoWcEh4GyHLlc/1mc6OvY0zPkHVFenf0sNaeAm98BrfGuySSQQXyZv3SSXOO oQP8mGmJKjMHwIDgEwXtKSxq2ZBRoW052AT1HAtcsPpMDUXVw85rwZtwja0gh1ysQAlo WDCgcfuT5Dkt2AeCruWKDyaTK+sIOTNEzQivPHW979iH5A+gperQiQMi/5oAhltLEtfx cwyA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=YH2qD5xXMXd9KWQRNnJdLAUzO7MmSKChP3VSVtptyAc=; b=KuGpIPfsMWOD418346tACk96XYZ4i7fublccoU52VPzG6i8b3fa2aJ5J4+zRUiQEVD TCmI099EMN7R579IJ0hJKGXVafzRPDPui8KN6B5XpIinqo4JJaQFOajfwOEMsjJ8kbSb x5DKvl8rX3JBcjRhDQoZ+UF15PTA9Gzk60o8sRBEzBFbvTQcx0XRZ5FMgP4ikAkWfHOK j5fseJ4KjQrcRA0BMRX/lUs+PnBDlItFaNkBYiz/1sfsEDJYyuJPbNafT2WzxnWpIgG9 iGf41hyTGAHyvIXxIbJaqaT6U9+pAd0aD2FSp0WfM+BQUQdTnUrCRSYMYtFUiTjwlmfq 3srA== X-Gm-Message-State: APjAAAUw2hzqIFLkGauz0SOSPyd5xF2rrcFU+UhngP88mVTm1zSigjlN UvTKX1AunPURoNXWv55tbvEovMuE X-Google-Smtp-Source: APXvYqxwkK+fDBFXisOeln8xr1YtlKdrAo5t5zz270R4QpWJbKVnG/aKDMADLWdJLdHe6caMOV6Nmw== X-Received: by 2002:a05:620a:166a:: with SMTP id d10mr14062899qko.37.1578888716913; Sun, 12 Jan 2020 20:11:56 -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 u57sm5087630qth.68.2020.01.12.20.11.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jan 2020 20:11:56 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jan 2020 23:11:28 -0500 Message-Id: <20200113041130.30126-4-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200113041130.30126-1-andriy.gelman@gmail.com> References: <20200113041130.30126-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/v4l2_context: Use AVERROR macro 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 Signed-off-by: Andriy Gelman --- libavcodec/v4l2_context.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/v4l2_context.c b/libavcodec/v4l2_context.c index d38ff732dbf..5b8d5f225cd 100644 --- a/libavcodec/v4l2_context.c +++ b/libavcodec/v4l2_context.c @@ -207,7 +207,7 @@ static int v4l2_handle_event(V4L2Context *ctx) ret = ff_v4l2_m2m_codec_full_reinit(s); if (ret) { av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_full_reinit\n"); - return -EINVAL; + return AVERROR(EINVAL); } goto reinit_run; } @@ -221,7 +221,7 @@ static int v4l2_handle_event(V4L2Context *ctx) ret = ff_v4l2_m2m_codec_reinit(s); if (ret) { av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_reinit\n"); - return -EINVAL; + return AVERROR(EINVAL); } goto reinit_run; }