From patchwork Mon Nov 23 19:37:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23999 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 7E86B44A49B for ; Mon, 23 Nov 2020 21:38:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B70A68BC5E; Mon, 23 Nov 2020 21:38:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABB3F68BBF1 for ; Mon, 23 Nov 2020 21:38:22 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id g14so4598761wrm.13 for ; Mon, 23 Nov 2020 11:38:22 -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=czybI2lzfRP1cf+xh0LwfQAXVuWPEhxU43MC0DYYPQs=; b=D0yH7BGgljKoq80mJzG4kRXqKY6yXNKyHB6jqAK+lxCaQWbtnE2AQTBVCF9GJWhPq2 PDWpSD+kh4NV6cxCrKHiqDtbCmNqeGmJdv6RP61ThgQBprf1UEu58gu4HGvuNXGFi3V5 wWVKmY5pJFfJuqnofdqH3OUDKeIKT5NPAtpPgjVOCK4k2aubc4uXomgKTLHOlFXVWEzr 6lP5jSCetRTi13cIePuV4ZSmOPg8tDYrY3WCKl2tTwA2m519Yzj/z1iwldgMTHy7uszL DzxWu9X4NNIksHIrrrZioL15/GupC0XtI8Hwv7zrHvoZvPMEdsLpDOhmqEC1/Jowx8FI DpXA== 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=czybI2lzfRP1cf+xh0LwfQAXVuWPEhxU43MC0DYYPQs=; b=DwRkFwr7gpmEUCbZFy9H0osQl1GP2t67G0cB03zmM3TuMhhpAgZ6ZsTM/DV0ByK82c zPovOHZ7Vh1C7DB0f135vvMfZMz/EI24aKZjYz9Do21bgwq69ju3pA9qDd+EvmK3lGqj Zf7OPAZ5s4d0gczO3HvnlapZC8Kl9GyGcR7zykR9e79gDf2Ca+pHo09yyLTUktR5rSTU EiaS9NNNEsOvYPneYNy1JBaiAcl1zeDrjijdrbPyUmjNcPwUbitefnl+pU69aTinqq8S dp+zyryLjv0BVT8b9MhCjIh8nsUqhEt/owhkugt2nsPGdt3xwVXOJcYa4AaCKL5HRSwX TiWw== X-Gm-Message-State: AOAM531xdd9cKwg5Gzfo3UbnkvCELY+wQSUeyiOMVRRLc9Nzdvk87PPY maWxyB9I5TDFm5TjE348eCvV0ciTqTH2EQ== X-Google-Smtp-Source: ABdhPJxqpCWQRaOpeho7nOpJgxGfcyvx/dcQMTrvCOxxtRI6VsFCxT89px7GHzNdZdagoR9P+SdREg== X-Received: by 2002:a5d:56cb:: with SMTP id m11mr1327573wrw.346.1606160301953; Mon, 23 Nov 2020 11:38:21 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id e6sm564086wme.27.2020.11.23.11.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:38:21 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 20:37:27 +0100 Message-Id: <20201123193739.1249300-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 179/191] avcodec/mpeg12: Reindentation 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/mpeg12.c | 54 ++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index e5c611414b..e9eff0c48e 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -137,33 +137,33 @@ VLC ff_mb_pat_vlc; static av_cold void mpeg12_init_vlcs(void) { - INIT_VLC_STATIC(&ff_dc_lum_vlc, DC_VLC_BITS, 12, - ff_mpeg12_vlc_dc_lum_bits, 1, 1, - ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); - INIT_VLC_STATIC(&ff_dc_chroma_vlc, DC_VLC_BITS, 12, - ff_mpeg12_vlc_dc_chroma_bits, 1, 1, - ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514); - INIT_VLC_STATIC(&ff_mv_vlc, MV_VLC_BITS, 17, - &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, - &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 266); - INIT_VLC_STATIC(&ff_mbincr_vlc, MBINCR_VLC_BITS, 36, - &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, - &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538); - INIT_VLC_STATIC(&ff_mb_pat_vlc, MB_PAT_VLC_BITS, 64, - &ff_mpeg12_mbPatTable[0][1], 2, 1, - &ff_mpeg12_mbPatTable[0][0], 2, 1, 512); - - INIT_VLC_STATIC(&ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, - &table_mb_ptype[0][1], 2, 1, - &table_mb_ptype[0][0], 2, 1, 64); - INIT_VLC_STATIC(&ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, - &table_mb_btype[0][1], 2, 1, - &table_mb_btype[0][0], 2, 1, 64); - ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); - ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); - - INIT_2D_VLC_RL(ff_rl_mpeg1, 680, 0); - INIT_2D_VLC_RL(ff_rl_mpeg2, 674, 0); + INIT_VLC_STATIC(&ff_dc_lum_vlc, DC_VLC_BITS, 12, + ff_mpeg12_vlc_dc_lum_bits, 1, 1, + ff_mpeg12_vlc_dc_lum_code, 2, 2, 512); + INIT_VLC_STATIC(&ff_dc_chroma_vlc, DC_VLC_BITS, 12, + ff_mpeg12_vlc_dc_chroma_bits, 1, 1, + ff_mpeg12_vlc_dc_chroma_code, 2, 2, 514); + INIT_VLC_STATIC(&ff_mv_vlc, MV_VLC_BITS, 17, + &ff_mpeg12_mbMotionVectorTable[0][1], 2, 1, + &ff_mpeg12_mbMotionVectorTable[0][0], 2, 1, 266); + INIT_VLC_STATIC(&ff_mbincr_vlc, MBINCR_VLC_BITS, 36, + &ff_mpeg12_mbAddrIncrTable[0][1], 2, 1, + &ff_mpeg12_mbAddrIncrTable[0][0], 2, 1, 538); + INIT_VLC_STATIC(&ff_mb_pat_vlc, MB_PAT_VLC_BITS, 64, + &ff_mpeg12_mbPatTable[0][1], 2, 1, + &ff_mpeg12_mbPatTable[0][0], 2, 1, 512); + + INIT_VLC_STATIC(&ff_mb_ptype_vlc, MB_PTYPE_VLC_BITS, 7, + &table_mb_ptype[0][1], 2, 1, + &table_mb_ptype[0][0], 2, 1, 64); + INIT_VLC_STATIC(&ff_mb_btype_vlc, MB_BTYPE_VLC_BITS, 11, + &table_mb_btype[0][1], 2, 1, + &table_mb_btype[0][0], 2, 1, 64); + ff_rl_init(&ff_rl_mpeg1, ff_mpeg12_static_rl_table_store[0]); + ff_rl_init(&ff_rl_mpeg2, ff_mpeg12_static_rl_table_store[1]); + + INIT_2D_VLC_RL(ff_rl_mpeg1, 680, 0); + INIT_2D_VLC_RL(ff_rl_mpeg2, 674, 0); } av_cold void ff_mpeg12_init_vlcs(void)