From 928cb84b32b639841ac1ec2957155a6abd53309f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 3 Sep 2014 04:52:50 +0200 Subject: [PATCH] avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used Signed-off-by: Michael Niedermayer --- libavcodec/idctdsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index cf12f1606ae..19e81262613 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -292,9 +292,6 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->put_signed_pixels_clamped = put_signed_pixels_clamped_c; c->add_pixels_clamped = add_pixels_clamped_c; - ff_put_pixels_clamped = c->put_pixels_clamped; - ff_add_pixels_clamped = c->add_pixels_clamped; - if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID) ff_xvid_idct_init(c, avctx); @@ -307,6 +304,9 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) if (ARCH_X86) ff_idctdsp_init_x86(c, avctx, high_bit_depth); + ff_put_pixels_clamped = c->put_pixels_clamped; + ff_add_pixels_clamped = c->add_pixels_clamped; + ff_init_scantable_permutation(c->idct_permutation, c->perm_type); } -- 2.39.2