From patchwork Fri Jul 17 02:09:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 21137 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 836D04488F6 for ; Fri, 17 Jul 2020 05:18:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D5E968B5FC; Fri, 17 Jul 2020 05:18:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B554A68B588 for ; Fri, 17 Jul 2020 05:17:56 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id k18so7537115qke.4 for ; Thu, 16 Jul 2020 19:17:56 -0700 (PDT) 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=oTti01P25gDoiDdtWJZQxcpTFzaXmfiTYpHmbDH4ZGc=; b=tPnnUZtlRGdwbUT+/dNIkyZzYBXsThBjFJUdJ0YG3zI7MahKqeqgKfEzLK8WR6xQfp eznBZ/90gX6pqpxagIpw3ZgyiXOqy6U6pmYnLhruMOUniTjJnnbOrp2da3Wpi300nRhc 7TkQovI8LLUq1VHf19JUBgPPdLv1FiL0GO5ooDTU30xmj3z1nd07Cig+HWzws85XSCTP CfTK9YKEKj1ek6f9BKosq+UM+HHRVbBKldpVfUkWaec9pEiL6AUrzl66tIULViG6oItN jCh4Z7SijhSL830G00vqO/N1kS4+mdof7cqJyb0TRZYj8UC3nZdBmz1S0+4kv4lmq7Kl aNkQ== 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=oTti01P25gDoiDdtWJZQxcpTFzaXmfiTYpHmbDH4ZGc=; b=UsJ7PVyFiNJE3u0DaE1tPfYVXmXCTd5BU82rH4O+whwK2NEuxG4BgCJhuVjETXqobM ddCenrSm7MiNopIX5xc58uU4dW4uDEruZWMsNi51poKQxS6hQ1dhMJIKTbyQdbm19wl0 pvANUB/2Ac4jmJgb2m7l/F0E42cftjUJRcEJLUqd1Kr1O68gPnWz0YU5LoGpFhjsE1x3 FifBeEV5X74Egsh3r+vL3iGxDym94Qb0pqAv+9DgFg2OmmlPlr1Qpr61vcaByhKIK+tQ bjPTL2U9S7N/E3Jcr5QRIX8TthERwfI2UfBZ1omJjry/O6VOhwU2oCx+q7hS3SW3ZL/v JuKg== X-Gm-Message-State: AOAM5303tLkEmRcnpAdoUMcArlQmiCgmQGFHmPHPCBR4BFNQ+H8v4PXG Tpm/+o0TkbRV87txlRxk9Lhsgdii X-Google-Smtp-Source: ABdhPJzvFqFaVpIFCwwVw1WvcRP3FuQXPDdiHw12QKAZlVY6eJ3JOsn5Z9TRdK1eniyiYwhAACxkBQ== X-Received: by 2002:ac8:fec:: with SMTP id f41mr7712856qtk.212.1594951791757; Thu, 16 Jul 2020 19:09:51 -0700 (PDT) Received: from localhost.localdomain (c-71-232-27-28.hsd1.ma.comcast.net. [71.232.27.28]) by smtp.gmail.com with ESMTPSA id u71sm9704200qka.40.2020.07.16.19.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jul 2020 19:09:51 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jul 2020 22:09:18 -0400 Message-Id: <20200717020918.385084-3-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200717020918.385084-1-andriy.gelman@gmail.com> References: <20200717020918.385084-1-andriy.gelman@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/v4l2_m2m_enc: reindent after previous commit 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_enc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 6d74c4c083d..6e18217c35f 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -296,12 +296,12 @@ static int v4l2_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) goto dequeue; if (!frame->buf[0]) { - ret = ff_encode_get_frame(avctx, frame); - if (ret < 0 && ret != AVERROR_EOF) - return ret; + ret = ff_encode_get_frame(avctx, frame); + if (ret < 0 && ret != AVERROR_EOF) + return ret; - if (ret == AVERROR_EOF) - frame = NULL; + if (ret == AVERROR_EOF) + frame = NULL; } ret = v4l2_send_frame(avctx, frame);