diff mbox series

[FFmpeg-devel,17/17] avcodec/msmpeg4dec: Reindent after the previous commit

Message ID AM7PR03MB66604A1A24A5AD5697B0BD918F319@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Headers show
Series [FFmpeg-devel,01/17] avcodec/svq3: Mark decoder as init-threadsafe | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Andreas Rheinhardt Feb. 12, 2022, 6:41 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/msmpeg4dec.c | 114 ++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 57 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c
index ba72c7ee50..ac7c7d75e2 100644
--- a/libavcodec/msmpeg4dec.c
+++ b/libavcodec/msmpeg4dec.c
@@ -298,70 +298,70 @@  static av_cold void msmpeg4_decode_init_static(void)
 {
     MVTable *mv;
 
-        INIT_FIRST_VLC_RL(ff_rl_table[0], 642);
-        INIT_FIRST_VLC_RL(ff_rl_table[1], 1104);
-        INIT_FIRST_VLC_RL(ff_rl_table[2], 554);
-        INIT_VLC_RL(ff_rl_table[3], 940);
-        INIT_VLC_RL(ff_rl_table[4], 962);
-        /* ff_rl_table[5] coincides with ff_h263_rl_inter which has just been
-         * initialized in ff_h263_decode_init() above. So just copy the VLCs. */
-        av_assert1(ff_h263_rl_inter.rl_vlc[0]);
-        memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc));
-
-        mv = &ff_mv_tables[0];
-        INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1,
+    INIT_FIRST_VLC_RL(ff_rl_table[0], 642);
+    INIT_FIRST_VLC_RL(ff_rl_table[1], 1104);
+    INIT_FIRST_VLC_RL(ff_rl_table[2], 554);
+    INIT_VLC_RL(ff_rl_table[3], 940);
+    INIT_VLC_RL(ff_rl_table[4], 962);
+    /* ff_rl_table[5] coincides with ff_h263_rl_inter which has just been
+        * initialized in ff_h263_decode_init() above. So just copy the VLCs. */
+    av_assert1(ff_h263_rl_inter.rl_vlc[0]);
+    memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc));
+
+    mv = &ff_mv_tables[0];
+    INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1,
                     mv->table_mv_bits, 1, 1,
                     mv->table_mv_code, 2, 2, 3714);
-        mv = &ff_mv_tables[1];
-        INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1,
+    mv = &ff_mv_tables[1];
+    INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1,
                     mv->table_mv_bits, 1, 1,
                     mv->table_mv_code, 2, 2, 2694);
 
-        INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
-                 &ff_table0_dc_lum[0][1], 8, 4,
-                 &ff_table0_dc_lum[0][0], 8, 4, 1158);
-        INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
-                 &ff_table0_dc_chroma[0][1], 8, 4,
-                 &ff_table0_dc_chroma[0][0], 8, 4, 1118);
-        INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
-                 &ff_table1_dc_lum[0][1], 8, 4,
-                 &ff_table1_dc_lum[0][0], 8, 4, 1476);
-        INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
-                 &ff_table1_dc_chroma[0][1], 8, 4,
-                 &ff_table1_dc_chroma[0][0], 8, 4, 1216);
-
-        INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
-                 &ff_v2_dc_lum_table[0][1], 8, 4,
-                 &ff_v2_dc_lum_table[0][0], 8, 4, 1472);
-        INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
-                 &ff_v2_dc_chroma_table[0][1], 8, 4,
-                 &ff_v2_dc_chroma_table[0][0], 8, 4, 1506);
-
-        INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
-                 &ff_v2_intra_cbpc[0][1], 2, 1,
-                 &ff_v2_intra_cbpc[0][0], 2, 1, 8);
-        INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
-                 &ff_v2_mb_type[0][1], 2, 1,
-                 &ff_v2_mb_type[0][0], 2, 1, 128);
-
-        for (unsigned i = 0, offset = 0; i < 4; i++) {
-            static VLC_TYPE vlc_buf[1636 + 2648 + 1532 + 2488][2];
-            ff_mb_non_intra_vlc[i].table           = &vlc_buf[offset];
-            ff_mb_non_intra_vlc[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset;
-            init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128,
-                     &ff_wmv2_inter_table[i][0][1], 8, 4,
-                     &ff_wmv2_inter_table[i][0][0], 8, 4,
-                     INIT_VLC_STATIC_OVERLONG);
-            offset += ff_mb_non_intra_vlc[i].table_size;
-        }
+    INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[0], DC_VLC_BITS, 120,
+                    &ff_table0_dc_lum[0][1], 8, 4,
+                    &ff_table0_dc_lum[0][0], 8, 4, 1158);
+    INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[0], DC_VLC_BITS, 120,
+                    &ff_table0_dc_chroma[0][1], 8, 4,
+                    &ff_table0_dc_chroma[0][0], 8, 4, 1118);
+    INIT_VLC_STATIC(&ff_msmp4_dc_luma_vlc[1], DC_VLC_BITS, 120,
+                    &ff_table1_dc_lum[0][1], 8, 4,
+                    &ff_table1_dc_lum[0][0], 8, 4, 1476);
+    INIT_VLC_STATIC(&ff_msmp4_dc_chroma_vlc[1], DC_VLC_BITS, 120,
+                    &ff_table1_dc_chroma[0][1], 8, 4,
+                    &ff_table1_dc_chroma[0][0], 8, 4, 1216);
+
+    INIT_VLC_STATIC(&v2_dc_lum_vlc, DC_VLC_BITS, 512,
+                    &ff_v2_dc_lum_table[0][1], 8, 4,
+                    &ff_v2_dc_lum_table[0][0], 8, 4, 1472);
+    INIT_VLC_STATIC(&v2_dc_chroma_vlc, DC_VLC_BITS, 512,
+                    &ff_v2_dc_chroma_table[0][1], 8, 4,
+                    &ff_v2_dc_chroma_table[0][0], 8, 4, 1506);
+
+    INIT_VLC_STATIC(&v2_intra_cbpc_vlc, V2_INTRA_CBPC_VLC_BITS, 4,
+                    &ff_v2_intra_cbpc[0][1], 2, 1,
+                    &ff_v2_intra_cbpc[0][0], 2, 1, 8);
+    INIT_VLC_STATIC(&v2_mb_type_vlc, V2_MB_TYPE_VLC_BITS, 8,
+                    &ff_v2_mb_type[0][1], 2, 1,
+                    &ff_v2_mb_type[0][0], 2, 1, 128);
+
+    for (unsigned i = 0, offset = 0; i < 4; i++) {
+        static VLC_TYPE vlc_buf[1636 + 2648 + 1532 + 2488][2];
+        ff_mb_non_intra_vlc[i].table           = &vlc_buf[offset];
+        ff_mb_non_intra_vlc[i].table_allocated = FF_ARRAY_ELEMS(vlc_buf) - offset;
+        init_vlc(&ff_mb_non_intra_vlc[i], MB_NON_INTRA_VLC_BITS, 128,
+                 &ff_wmv2_inter_table[i][0][1], 8, 4,
+                 &ff_wmv2_inter_table[i][0][0], 8, 4,
+                 INIT_VLC_STATIC_OVERLONG);
+        offset += ff_mb_non_intra_vlc[i].table_size;
+    }
 
-        INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
-                 &ff_msmp4_mb_i_table[0][1], 4, 2,
-                 &ff_msmp4_mb_i_table[0][0], 4, 2, 536);
+    INIT_VLC_STATIC(&ff_msmp4_mb_i_vlc, MB_INTRA_VLC_BITS, 64,
+                    &ff_msmp4_mb_i_table[0][1], 4, 2,
+                    &ff_msmp4_mb_i_table[0][0], 4, 2, 536);
 
-        INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
-                 &ff_table_inter_intra[0][1], 2, 1,
-                 &ff_table_inter_intra[0][0], 2, 1, 8);
+    INIT_VLC_STATIC(&ff_inter_intra_vlc, INTER_INTRA_VLC_BITS, 4,
+                    &ff_table_inter_intra[0][1], 2, 1,
+                    &ff_table_inter_intra[0][0], 2, 1, 8);
 }
 
 av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx)