Browse code
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 <michaelni@gmx.at>
Carl Eugen Hoyos authored on 2012/06/04 19:15:41Showing 1 changed files
| ... | ... |
@@ -29,7 +29,7 @@ |
| 29 | 29 |
|
| 30 | 30 |
#define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX)) |
| 31 | 31 |
|
| 32 |
-#if CONFIG_PRORES_DECODER |
|
| 32 |
+#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER |
|
| 33 | 33 |
/** |
| 34 | 34 |
* Add bias value, clamp and output pixels of a slice |
| 35 | 35 |
*/ |
| ... | ... |
@@ -70,7 +70,7 @@ static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block) |
| 70 | 70 |
|
| 71 | 71 |
void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) |
| 72 | 72 |
{
|
| 73 |
-#if CONFIG_PRORES_DECODER |
|
| 73 |
+#if CONFIG_PRORES_DECODER | CONFIG_PRORES_LGPL_DECODER |
|
| 74 | 74 |
dsp->idct_put = prores_idct_put_c; |
| 75 | 75 |
dsp->idct_permutation_type = FF_NO_IDCT_PERM; |
| 76 | 76 |
|