From 11b32b780f9d573fdd3afc2255ce99abc28c4fc8 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 25 Jun 2025 07:08:41 +0200 Subject: [PATCH] avcodec/msmpeg4: Avoid branch Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 79a43602b1..45c56a9ad9 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -143,18 +143,14 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s) case MSMP4_WMV1: s->y_dc_scale_table= ff_wmv1_y_dc_scale_table; s->c_dc_scale_table= ff_wmv1_c_dc_scale_table; - break; - } - - if (s->msmpeg4_version >= MSMP4_WMV1) { ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]); ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_wmv1_scantable[0]); ff_permute_scantable(s->permutated_intra_h_scantable, ff_wmv1_scantable[2], s->idsp.idct_permutation); ff_permute_scantable(s->permutated_intra_v_scantable, ff_wmv1_scantable[3], s->idsp.idct_permutation); + break; } - //Note the default tables are set in common_init in mpegvideo.c ff_thread_once(&init_static_once, msmpeg4_common_init_static); }