From patchwork Mon Jun 17 03:42:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13577 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 BF8CD447E17 for ; Mon, 17 Jun 2019 06:50:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A86D4689D0E; Mon, 17 Jun 2019 06:50:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 25303689D0E for ; Mon, 17 Jun 2019 06:50:31 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id d18so8269551wrs.5 for ; Sun, 16 Jun 2019 20:50:31 -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=hmh+IbhoJxT8XYz/Ac+OX4mcmbrw7VuK6Rt+EagN11s=; b=EQoWihm3V0XT33x4Z2gWatExMAo2rxc8n1e3zIdIQHRR5g1EC5pATjI27l+N8DsMXz o9eLAZt6AiL3t79Da5Kng2dwzbs/dp3Ab4aPjMRTEpZtcgISez//z+lWFWZLf/FCS1Tk ULJNeKaRXYjbbEXfu4DS6oHUswQ/g1U3o/KLKHScfPHjBxqaYDITM5Tp9ee0pgIEyh0S hn9jpROM5FkaMv62Nsiv/nZ3NUAopi45DPx2nHOsOI8cHQNOgs7p94S9n5sdeNaxnTiU /utWDpzbAd6zlohn9zhQoqhyaF6TnefjqQUa3vnniOwxkbAauwG76jxxoJrd39CVMIry pEGA== 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=hmh+IbhoJxT8XYz/Ac+OX4mcmbrw7VuK6Rt+EagN11s=; b=UzMp4Xf7yDm82JkAhBb/okXbvn6k3OQXnH7BH5oARGZ+txtMxKoUWxsxX7NvHMAfjb 9igiMGlxWuD2XjnklWRWNcREqIq118whMdC5XhBKfY1t8k7E2JLAOUDExDDMGzNdPet9 uGEFVyYEFh8zu2+IEoxqb7tnEDqSOXI+cXosC5vpjXos+E7hAiRXqOGhHm+atpwRnp9q cv+YhgiW9lIrcq83TmboZm+egYLpt0LJpoj3VlautLd0EVZkAf0lzS5kVshbrb+rlSOf S/E4bIIhHf1Hut/ksdnTDcvoS6CdtJXy2GfBtJ3VUkkkA29fOrGQx03c3GbY5UmgvmZO MZHA== X-Gm-Message-State: APjAAAVJ/L/KwtxaJ3Q65/d+YHe2/SUikskVO8Ys/ORzGWiAcWorsrK4 zj40d/TF0dqq5GoCs4NHES8I0JYf X-Google-Smtp-Source: APXvYqyfBdkT9VErPLAYQKfHySWkdQae1z4iCS+GKH27cBBFWAL9QqoaGULFOLf4gKetWAXWCRqg7A== X-Received: by 2002:adf:e8c8:: with SMTP id k8mr45935691wrn.285.1560743037073; Sun, 16 Jun 2019 20:43:57 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id x83sm9632889wmb.42.2019.06.16.20.43.56 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 20:43:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2019 05:42:10 +0200 Message-Id: <20190617034223.21195-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/18] filter_units: 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/filter_units_bsf.c | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/libavcodec/filter_units_bsf.c b/libavcodec/filter_units_bsf.c index a787933f0a..8c501e1726 100644 --- a/libavcodec/filter_units_bsf.c +++ b/libavcodec/filter_units_bsf.c @@ -105,33 +105,33 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out) AVPacket *in = NULL; int err, i, j; - err = ff_bsf_get_packet(bsf, &in); - if (err < 0) - return err; + err = ff_bsf_get_packet(bsf, &in); + if (err < 0) + return err; - if (ctx->mode == NOOP) { - av_packet_move_ref(out, in); - av_packet_free(&in); - return 0; - } + if (ctx->mode == NOOP) { + av_packet_move_ref(out, in); + av_packet_free(&in); + return 0; + } - err = ff_cbs_read_packet(ctx->cbc, frag, in); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); - goto fail; - } + err = ff_cbs_read_packet(ctx->cbc, frag, in); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); + goto fail; + } - for (i = 0; i < frag->nb_units; i++) { - for (j = 0; j < ctx->nb_types; j++) { - if (frag->units[i].type == ctx->type_list[j]) - break; - } - if (ctx->mode == REMOVE ? j < ctx->nb_types - : j >= ctx->nb_types) { - ff_cbs_delete_unit(ctx->cbc, frag, i); - --i; - } + for (i = 0; i < frag->nb_units; i++) { + for (j = 0; j < ctx->nb_types; j++) { + if (frag->units[i].type == ctx->type_list[j]) + break; + } + if (ctx->mode == REMOVE ? j < ctx->nb_types + : j >= ctx->nb_types) { + ff_cbs_delete_unit(ctx->cbc, frag, i); + --i; } + } if (frag->nb_units == 0) { // Don't return packets with nothing in them.