From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Mon, 4 Jun 2012 10:15:41 +0000 (+0200)
Subject: Fix compilation condition for some ProRes dsp decoder functions.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=84986b4e61994c64ef2ea6161c473f82a2672cbc;p=ffmpeg

Fix compilation condition for some ProRes dsp decoder functions.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
---

diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index 68c6f3e44ff..ad1effcae49 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;