From patchwork Wed Apr 24 07:59:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Bouron X-Patchwork-Id: 12886 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 E85CE4495B5 for ; Wed, 24 Apr 2019 10:59:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D2E4B68A6B5; Wed, 24 Apr 2019 10:59:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 958C26805B9 for ; Wed, 24 Apr 2019 10:59:36 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id a3so14106189wrx.0 for ; Wed, 24 Apr 2019 00:59:36 -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=udkWTdfXsy6QuVgE5j5U6ld5FGuuLfPFYWxgMdnvKyY=; b=m4oR6372xnNTnkDZiwudmyjgNFsywTRFmeux/q7x7vpxXHcFMNgZ7r/o8SB0jbxgJ8 1I9fl6ECsPAIBAxIjGCiflbTUjn2f8wk44uJdWMd76X6upv9WvT/qwSucbs1ytk71yIN 1iehbCuKcc09jnZxWarkmAjvM4BmOpNcIyV8p9eyXae2AUPoxMCr2KCROt6GZyjlVLDZ oU+ddQWbJMJlYKetDoP1HRrbFxh1Y0D/VlGYvGpQNGYu8LC+Sm2i2IQodqgYF79KKylu t2B2ag0xqmx2oxXPwns+E6kV9JNOUtyTEh90tFMltIKgunOooqIAzBFJivHy0MRh+mJA di7w== 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=udkWTdfXsy6QuVgE5j5U6ld5FGuuLfPFYWxgMdnvKyY=; b=iPY9zfmCA6GiExZ0eSeCmf9jxLXjJN+7xrB8Oql+WxaaJrEh+TrMeEmwA5MMwKi/+N nzQltNjWb6swvRgxa1tfj6GSta1PszvoreDNzj6KQHW7DdSslAZc7YXXXQz3J8Z1IwUZ Tj6bEmMeue3AAJC4T9W5MC7M2vnA4ZwQ6/8QlLHFcTnDPM4byWbg6ofdYssW34+S7TJY tx4rDowOffwA1vZwzB3iWAT+uGOOPsJmwujpaU+rAhsMgGJV9HQKyrPnDXICX8NsJ9Nh ynLQvr7hERe/Jk51nEx1eDhR76RSE6O6zt8sT5qSYHZdkYmbuSwvdVQ8R/GbkvxQkY9M W/1g== X-Gm-Message-State: APjAAAVdXF8cP/s+S7dIdq1L1Ze1hkcPy5FWySd/wVLYdKewEp7hzxie vZJpl8+kIgwzUbDCeEIs5ulLHjHb X-Google-Smtp-Source: APXvYqzlUiipWM2MYyiV9BcJR8BeUi8WBG8RywTaKAkGpzciHKwvnWaQcABStJF1tBhuOPSdUUwRdQ== X-Received: by 2002:adf:e4c2:: with SMTP id v2mr20186535wrm.124.1556092775895; Wed, 24 Apr 2019 00:59:35 -0700 (PDT) Received: from kusa.lan (lfbn-idf2-1-381-242.w82-123.abo.wanadoo.fr. [82.123.96.242]) by smtp.gmail.com with ESMTPSA id f10sm18111221wrs.17.2019.04.24.00.59.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 00:59:35 -0700 (PDT) From: Matthieu Bouron To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Apr 2019 09:59:30 +0200 Message-Id: <20190424075930.16157-3-matthieu.bouron@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424075930.16157-1-matthieu.bouron@gmail.com> References: <20190424075930.16157-1-matthieu.bouron@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mediacodecdec: re-indent 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: Matthieu Bouron Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mediacodecdec_common.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index f90e2f1a23..1656cd6664 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -634,18 +634,18 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, return 0; } - size = FFMIN(pkt->size - offset, size); - memcpy(data, pkt->data + offset, size); - offset += size; + size = FFMIN(pkt->size - offset, size); + memcpy(data, pkt->data + offset, size); + offset += size; - status = ff_AMediaCodec_queueInputBuffer(codec, index, 0, size, pts, 0); - if (status < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to queue input buffer (status = %d)\n", status); - return AVERROR_EXTERNAL; - } + status = ff_AMediaCodec_queueInputBuffer(codec, index, 0, size, pts, 0); + if (status < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to queue input buffer (status = %d)\n", status); + return AVERROR_EXTERNAL; + } - av_log(avctx, AV_LOG_TRACE, - "Queued input buffer %zd size=%zd ts=%"PRIi64"\n", index, size, pts); + av_log(avctx, AV_LOG_TRACE, + "Queued input buffer %zd size=%zd ts=%"PRIi64"\n", index, size, pts); } if (offset == 0)