From patchwork Sat Jan 23 20:47:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25129 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 03B0944B48E for ; Sat, 23 Jan 2021 22:48:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5C19689F4F; Sat, 23 Jan 2021 22:48:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D69E9688175 for ; Sat, 23 Jan 2021 22:48:33 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id b5so8426299wrr.10 for ; Sat, 23 Jan 2021 12:48:33 -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:reply-to :mime-version:content-transfer-encoding; bh=ZIwU2BMkY2R5g3R4QN1oVmhml9+nhDTP4IdRx2pVpk4=; b=upiRtYYG7HmbVaDuOwRAYsH8jFale46eNqmpnEtL8bjxB7Exz+UlXDAPMJ/M4VQ7Qp kgOlUmPxZaqcJL0YNKYknIDLLOxpv3jlb6o+EkhcXgWIAMbLKXJg/Rz1Vh9dM2oZwLon deh2+xWpBIUGqqoeLG5VZ5PtX9TulX1KgbGpSU5qhWyS4j0FcKyOv3zA7tYWJQUw7WDm gHlia8T90pV6a1n4RattdB/MiB8jO+tea2EY5/24o/JMrx1+PQhLWRwRAWcsiapuPh+p WoK43wWEUkJg5ZHOu9QQ0OpAfk4ZxIhINNeRkss6e7ijvWxrNcShzxWkPCz2wKLFxz7x fctA== 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:reply-to:mime-version:content-transfer-encoding; bh=ZIwU2BMkY2R5g3R4QN1oVmhml9+nhDTP4IdRx2pVpk4=; b=lVZJO9nri9j5EEeDHO9lE5t2uuY2r2aLYg873yf1sNaWO+Hs3+V0NZOIZlWVC2cp8x Q4HZxk/uZJ6mOV9TY650muFBNg09i1FbpQbsSTOErCCd4KmSV3ZOnIjGxJNcZgoNhpc8 0eTS1jD7geOi63Kb5CnRAZm1XG/xRXKM8e4evKAeOom7niTSNjMBDgsdfKbzpJOvII/k A3bnM30mua7melM97epujT4upiszYAObLRs+iK7HRybeuVU7x74y9ZjZct1qoTZZ/9V8 ki4iDQxEkkn9xwtByfwP2zwrEtfQ5pGLCqPqRGBb5WQTMingqOfTuheR+nf1/7ZjFKm2 G33w== X-Gm-Message-State: AOAM533lu1Wpa7Z2bo/yZI9s3CJprBOKaIMBJjUUJqmnLXRXq/H0eG1j VqPxi2DkfK3o2T1Co2FFUQIo4tA/sXU= X-Google-Smtp-Source: ABdhPJxcH+UZs5HNbQw4MmqdxzTyjM34HnJhk+PtByv1PxXFFUs28j9pzNoEmtf77ZRSY7HtqSNxSw== X-Received: by 2002:a5d:6351:: with SMTP id b17mr7162507wrw.410.1611434913012; Sat, 23 Jan 2021 12:48:33 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id g12sm16299529wmh.14.2021.01.23.12.48.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jan 2021 12:48:32 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jan 2021 21:47:59 +0100 Message-Id: <20210123204800.689497-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> References: <20210123204800.689497-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avcodec/mpeg4videodec: Fix indentation 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" It was wrong since e03bf251d8784f4d1df2c22381c902087e151e31. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index e364e0b493..a4479f889b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3201,15 +3201,15 @@ static int decode_studiovisualobject(Mpeg4DecContext *ctx, GetBitContext *gb) MpegEncContext *s = &ctx->m; int visual_object_type; - skip_bits(gb, 4); /* visual_object_verid */ - visual_object_type = get_bits(gb, 4); - if (visual_object_type != VOT_VIDEO_ID) { - avpriv_request_sample(s->avctx, "VO type %u", visual_object_type); - return AVERROR_PATCHWELCOME; - } + skip_bits(gb, 4); /* visual_object_verid */ + visual_object_type = get_bits(gb, 4); + if (visual_object_type != VOT_VIDEO_ID) { + avpriv_request_sample(s->avctx, "VO type %u", visual_object_type); + return AVERROR_PATCHWELCOME; + } - next_start_code_studio(gb); - extension_and_user_data(s, gb, 1); + next_start_code_studio(gb); + extension_and_user_data(s, gb, 1); return 0; }