From 706809adb23ef29592c7b087ca6205e6872012e7 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 4 Jun 2012 12:15:41 +0200 Subject: [PATCH] Fix compilation condition for some ProRes dsp decoder functions. Found, analysed and tested by trac user Jamal. Fixes part of Ticket #1404. (cherry picked from commit 84986b4e61994c64ef2ea6161c473f82a2672cbc) Signed-off-by: Michael Niedermayer --- libavcodec/proresdsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index 68c6f3e44f..ad1effcae4 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -29,7 +29,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 */ @@ -70,7 +70,7 @@ static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block) 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;