From patchwork Sun Dec 16 03:08:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 11434 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 79EE644CC27 for ; Sun, 16 Dec 2018 05:09:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EAB268AB46; Sun, 16 Dec 2018 05:09:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A703B68AB45 for ; Sun, 16 Dec 2018 05:09:09 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id t13so4473094pgr.11 for ; Sat, 15 Dec 2018 19:09:10 -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; bh=NcH6C0lrsQBRPmwTuvh23T7B6Y7O79vICSYxh9amr1w=; b=GvoYc8gLchzbMw8HHkirEfbJoBJjaO7g3p7XpMum6Fuub+N05aeu3VjKn+x5YbyrrM /011HNOGeDaC0tIl1mHPes9ZbV0vGT8F/zyKUzIe6237HFy5Rqt/b3Yqdcm7XBvjtu0B JkQIGAJjONxPBVcQDgWowQlOMjxYpvkymOasAeeK94oR0VqZHsV8kqA6NifjhtRdveBI mNjR8tdGmqAiUXqS7GMZWQONAIov9hLDprnGAO1gOQc+e3T+z22NTEc/xgTfl9g87T95 spbvJUOnF2nYPfuVMCjR/H4LV5wQvLPySMs70PbbRUlq0gIYYq7HZWhZ29I3H43NGbHL LCig== 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; bh=NcH6C0lrsQBRPmwTuvh23T7B6Y7O79vICSYxh9amr1w=; b=RVABiyZ/N+lOhkfSeTF+im/JTRJIVK69/utIJf/De3/HsCaJH5Wx9aEw0CydL06rEu hyNU/esqqaE0FPpHJHfAPpszZJNg4kFZwrdtjtw1j7fI9L3vkKPBxr/iVG3+SUM/z63M Ct3yue7lSUAhEbuFH/PUlYJked+jfrlSJA1wVz4ZTUD+qhNTsnxCrc01jmQsRHPllKmt WT3sGS/lVdDTbZW0LNlvx8Ld9qLLrQiEbJtAXiRGLV71U4Ejree+CPuEzyDG9wYcyJ4A WehFKMUcOmMYaL6dJU2zfjPW8Gy2ARItH2GIgdxPWXUwIkH/sCIO+BZvDEW4pNWLMzlx wi2w== X-Gm-Message-State: AA+aEWaMKU14OaJhUImgK68JRdeFhyl4+lb8nTroKjjjgFliL9cWhnLW DuypT1weuoZpJD1VrmusTw6j7OSB X-Google-Smtp-Source: AFSGD/V13zR7b4o5B6vxyJ6wHHDZSHwdH2mAzAMx8+6GG1WdFAjWPrsaRUWTZC1JM6U4iS5jy8qTQw== X-Received: by 2002:a63:374e:: with SMTP id g14mr4836513pgn.59.1544929748612; Sat, 15 Dec 2018 19:09:08 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id d21sm13757767pgv.37.2018.12.15.19.09.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Dec 2018 19:09:07 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Dec 2018 11:08:22 +0800 Message-Id: <1544929702-28120-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1544929702-28120-1-git-send-email-mypopydev@gmail.com> References: <1544929702-28120-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 3/3] lavc/libkvazaar: indent the code 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" indent the code to follow FFmpeg's coding style Signed-off-by: Jun Zhao --- libavcodec/libkvazaar.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c index 50910b7..a89ca7f 100644 --- a/libavcodec/libkvazaar.c +++ b/libavcodec/libkvazaar.c @@ -153,8 +153,8 @@ static av_cold int libkvazaar_close(AVCodecContext *avctx) LibkvazaarContext *ctx = avctx->priv_data; if (ctx->api) { - ctx->api->encoder_close(ctx->encoder); - ctx->api->config_destroy(ctx->config); + ctx->api->encoder_close(ctx->encoder); + ctx->api->config_destroy(ctx->config); } if (avctx->extradata) @@ -180,7 +180,7 @@ static int libkvazaar_encode(AVCodecContext *avctx, if (frame) { if (frame->width != ctx->config->width || - frame->height != ctx->config->height) { + frame->height != ctx->config->height) { av_log(avctx, AV_LOG_ERROR, "Changing video dimensions during encoding is not supported. " "(changed from %dx%d to %dx%d)\n", @@ -233,8 +233,7 @@ static int libkvazaar_encode(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Failed to encode frame.\n"); retval = AVERROR_INVALIDDATA; goto done; - } - else + } else retval = 0; /* kvazaar returns 1 on success */ if (data_out) { @@ -259,7 +258,7 @@ static int libkvazaar_encode(AVCodecContext *avctx, // IRAP VCL NAL unit types span the range // [BLA_W_LP (16), RSV_IRAP_VCL23 (23)]. if (frame_info.nal_unit_type >= KVZ_NAL_BLA_W_LP && - frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) { + frame_info.nal_unit_type <= KVZ_NAL_RSV_IRAP_VCL23) { avpkt->flags |= AV_PKT_FLAG_KEY; }