generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation condition for some ProRes dsp decoder functions.

Browse Source 
Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.
This commit is contained in:
Carl Eugen Hoyos 2012-06-04 12:15:41 +02:00
parent a4b885d55e
commit 84986b4e61
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/proresdsp.c
View File

@ -29,7 +29,7 @@
#define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX)) #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 * 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) 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_put = prores_idct_put_c;
dsp->idct_permutation_type = FF_NO_IDCT_PERM; dsp->idct_permutation_type = FF_NO_IDCT_PERM;