From patchwork Fri Aug 16 03:05:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14542 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 D09AF448852 for ; Fri, 16 Aug 2019 06:13:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B84BE68AD32; Fri, 16 Aug 2019 06:13:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AE14968AD11 for ; Fri, 16 Aug 2019 06:13:51 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 207so2880131wma.1 for ; Thu, 15 Aug 2019 20:13:51 -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=aQwsMy4G2I//NLjJFMVsAYcknej7AkwZT6pedpwhVB0=; b=OWzjbB04z/20zQXNxxL/XILmTaCCOGrlKsJ8zTPcs38n2SeTwBzaG1pRBWFCR91sAI PYKBX+nmxYZX8pLNNN5ayKqh2sFmeAPwsFAnQZyz2zky1MYMrdhMpNRLepJhnthOgGYb zQ2sMlilCwPJ27QMX7Ak4Q4ldr0yuaw/kHQ1G/a3EEaB/mKyf5G1deprFasgFF0iQ4gQ X9Raiy/0ZeiQehudaC5Xfhcixgd+mcFZNwNTsOSd/AuFbYJS8gBVEpRws6J02BEg879D zQXlt40wNJ7txwoq65DvyHtEyFm0Z7aBNYETi75Zs3kilYCTzZOyjD6LnpNFWH55C+RG cm8A== 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=aQwsMy4G2I//NLjJFMVsAYcknej7AkwZT6pedpwhVB0=; b=dwx1YI2I7XTeWVNcs6PNSphDasUCqme70crDX7dMNsUzniFMdUVvp0NxVunQAcYCSX YwGvnIXhQ3A048r+gWZoqaPdA+PAB9E351rBo8VKtTknN/RXJAdwbwh5EV/SxinIIO+r tcEKuNMiWv/j8K0Gym8K1ed32Yy+kH+LrpUZgEhB7f6+SGzFfkbq6RoZS0pixMdJ13Fy PU0mgSTMnHzOa3rFiQjYQz3NQOfjXgP5MAaZ+4pHI9oMCNnNFct3sIsakyqyKpHrpPNw mqkB5KmJ5mWRmORewtB1SEaPcOfhMQg2do0ftSS4/GK/hvJh4sDyHedeExAlcz88hYmq iiRg== X-Gm-Message-State: APjAAAVjzQrMBH1+lov6anKXIDo8fTIvfLNswFs4Jqj272niELoR0s7p DdLODn38zka2GOHvzaNMz+cFbGmf X-Google-Smtp-Source: APXvYqxMg2gzK0OJo6oLNZSWVqMtIccSiC5Na82r2jvMJt+JrTy+dti4QW447z5bJl1RJLIRECW6iw== X-Received: by 2002:a1c:a852:: with SMTP id r79mr4713235wme.36.1565925231056; Thu, 15 Aug 2019 20:13:51 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b69.dynamic.kabel-deutschland.de. [188.192.139.105]) by smtp.gmail.com with ESMTPSA id x20sm8501603wrg.10.2019.08.15.20.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 20:13:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Aug 2019 05:05:28 +0200 Message-Id: <20190816030531.4775-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> References: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/h264_parser: Reindent after previous commits 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_parser.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 188ba41c0b..669a9a5ff7 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -306,10 +306,10 @@ static inline int parse_nal_units(AVCodecParserContext *s, break; } - av_fast_padded_malloc(&rbsp->rbsp_buffer, &rbsp->rbsp_buffer_alloc_size, src_length); - if (!rbsp->rbsp_buffer) - return AVERROR(ENOMEM); - rbsp->rbsp_buffer_size = 0; + av_fast_padded_malloc(&rbsp->rbsp_buffer, &rbsp->rbsp_buffer_alloc_size, src_length); + if (!rbsp->rbsp_buffer) + return AVERROR(ENOMEM); + rbsp->rbsp_buffer_size = 0; consumed = ff_h2645_extract_rbsp(buf + buf_index, src_length, rbsp, &nal, 1); if (consumed < 0) @@ -364,31 +364,31 @@ static inline int parse_nal_units(AVCodecParserContext *s, } if (p->ps.pps != (const PPS*)p->ps.pps_list[pps_id]->data) { - av_buffer_unref(&p->ps.pps_ref); - p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); - if (!p->ps.pps_ref) { - p->ps.pps = NULL; - goto unref_sps; - } - p->ps.pps = (const PPS*)p->ps.pps_ref->data; + av_buffer_unref(&p->ps.pps_ref); + p->ps.pps_ref = av_buffer_ref(p->ps.pps_list[pps_id]); + if (!p->ps.pps_ref) { + p->ps.pps = NULL; + goto unref_sps; + } + p->ps.pps = (const PPS*)p->ps.pps_ref->data; } if (!p->ps.sps_list[p->ps.pps->sps_id]) { av_log(avctx, AV_LOG_ERROR, "non-existing SPS %u referenced\n", p->ps.pps->sps_id); unref_sps: - av_buffer_unref(&p->ps.sps_ref); - p->ps.sps = NULL; + av_buffer_unref(&p->ps.sps_ref); + p->ps.sps = NULL; goto fail; } if (p->ps.sps != (const SPS*)p->ps.sps_list[p->ps.pps->sps_id]->data) { - av_buffer_unref(&p->ps.sps_ref); - p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); - if (!p->ps.sps_ref) { - p->ps.sps = NULL; - goto fail; - } - p->ps.sps = (const SPS*)p->ps.sps_ref->data; + av_buffer_unref(&p->ps.sps_ref); + p->ps.sps_ref = av_buffer_ref(p->ps.sps_list[p->ps.pps->sps_id]); + if (!p->ps.sps_ref) { + p->ps.sps = NULL; + goto fail; + } + p->ps.sps = (const SPS*)p->ps.sps_ref->data; } sps = p->ps.sps;