diff options
Diffstat (limited to 'libavcodec/proresdsp.c')
| -rw-r--r-- | libavcodec/proresdsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 39d1206..867e403 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -30,7 +30,7 @@ #define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX)) -#if CONFIG_PRORES_DECODER +#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER /** * Add bias value, clamp and output pixels of a slice */ @@ -54,7 +54,7 @@ static void prores_idct_put_c(uint16_t *out, int linesize, DCTELEM *block, const } #endif -#if CONFIG_PRORES_ENCODER +#if CONFIG_PRORES_KOSTYA_ENCODER static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block) { int x, y; @@ -69,18 +69,18 @@ static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block) } #endif -void ff_proresdsp_init(ProresDSPContext *dsp) +void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { -#if CONFIG_PRORES_DECODER +#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER dsp->idct_put = prores_idct_put_c; dsp->idct_permutation_type = FF_NO_IDCT_PERM; - if (HAVE_MMX) ff_proresdsp_x86_init(dsp); + if (HAVE_MMX) ff_proresdsp_x86_init(dsp, avctx); ff_init_scantable_permutation(dsp->idct_permutation, dsp->idct_permutation_type); #endif -#if CONFIG_PRORES_ENCODER +#if CONFIG_PRORES_KOSTYA_ENCODER dsp->fdct = prores_fdct_c; dsp->dct_permutation_type = FF_NO_IDCT_PERM; ff_init_scantable_permutation(dsp->dct_permutation, |
