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

Fix compilation condition for some ProRes dsp encoder functions.

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

Fixes part of Ticket #1404.
(cherry picked from commit 568a5924180b0ce43e2706bf2491b70c455eb36a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Carl Eugen Hoyos 2012-06-04 12:18:56 +02:00 committed by Michael Niedermayer
parent 706809adb2
commit 31d3b3b5d5
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

@ -53,7 +53,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;
@ -79,7 +79,7 @@ void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *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,