From patchwork Sun Feb 16 19:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 17799 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 D6030448913 for ; Sun, 16 Feb 2020 21:39:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B7D16688170; Sun, 16 Feb 2020 21:39:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06CA2687FA2 for ; Sun, 16 Feb 2020 21:39:03 +0200 (EET) Received: by mail-io1-f67.google.com with SMTP id i11so3163931ioi.12 for ; Sun, 16 Feb 2020 11:39:02 -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=hVjvCgb7YxAWZDNQSftC3sofjnT4k8Ee88QPIPbIjiI=; b=abjyqDWrTpNJWdevwjsX2x+MvaRmCuKFlYm8FoyDyuOrH7ueqij4a7Kb8Pid80Q9KD LAGuTbuC6VbTrxAXAsDMX2GhrLzQKGIxETBeEGjGF1Zfy9u045HaHdlJy12dgdCA42DF SM/6qlH57opKpCUzDLm4z4W8PLu2WHyy5fxuqqsk+pijlsJIBF73KYS1fnax0BYB0z1T vADUa2CBDbAD4r2KsjJL3XTiZRkz16i2Y7a6F3hc9gMOBuVVQYvryAyMnD6JzKnxh7xD MwttGnG6IQYdLAPkq8ieRagk7D+62RjUCOC4UmBdr1DkQoqxh3uCWdvrFMr1jITS9pKo amGA== 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=hVjvCgb7YxAWZDNQSftC3sofjnT4k8Ee88QPIPbIjiI=; b=VZWa7HlGcWVCeL+ehntQ6LLTf5qFXl0ejObliMiSlZ/EA8biwRrE0+ug5DnPzdcMO0 2biQImDrvdp6Pvj/w2rykBEG7Qp45KS8T4VeYLBXEOW0Zh228RDU/Ycs54GLN1jOTrSj zNFDXOSReIsEnppJ/5cAyLXTPAA4ReomwTBmXJGaaJc1eR5MyYhyXd5xBdlSL1b+UBbR fUpYJ7yooaOuqdKrq9KEcKS3zeHOF5hfOMYm64kr06lkUPyiAHDVYD46TveLfy7vmDfS VdRUtMqH92pUfrKmYc4a1vcqFJ0O/WXYgqFBBhCvqrBNdaWQvRs0MRLoiUXGYVHX9veU mICg== X-Gm-Message-State: APjAAAWkZJLVUXAIAImdosUANIDf6ksu9Hq6PUn5BogFljg06RW3auhJ SR8bStq8AQ0W1a2N8h/y78l8UONw X-Google-Smtp-Source: APXvYqymhxdloQu3/8baQPQ46OlrH2YLhEMB5wgrv8ceKmbI/dPE8Es6GrLG98/Plgv8q6pANqHUoQ== X-Received: by 2002:aed:2202:: with SMTP id n2mr11130309qtc.4.1581881524043; Sun, 16 Feb 2020 11:32:04 -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 k5sm7617348qkk.117.2020.02.16.11.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 11:32:03 -0800 (PST) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Feb 2020 14:31:44 -0500 Message-Id: <20200216193144.14169-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200216193144.14169-1-andriy.gelman@gmail.com> References: <20200216193144.14169-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 3/3] avcodec/v4l2_m2m: Fix typo in log message and cosmetics 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_m2m.c | 4 ++-- libavcodec/v4l2_m2m_enc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c index d0bd4cd3d25..2d21f910bcc 100644 --- a/libavcodec/v4l2_m2m.c +++ b/libavcodec/v4l2_m2m.c @@ -264,8 +264,8 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s) ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF); if (ret) { - av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); - goto error; + av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n"); + goto error; } /* release and unmmap the buffers */ diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 5410cffe4a2..819f7e36109 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -84,7 +84,7 @@ static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed i ret = ioctl(s->fd, VIDIOC_G_EXT_CTRLS, &ctrls); if (ret < 0) { - av_log(s->avctx, AV_LOG_WARNING, "Failed to set %s\n", name); + av_log(s->avctx, AV_LOG_WARNING, "Failed to get %s\n", name); return ret; }