diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-06-04 12:18:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-07 00:55:26 +0200 |
| commit | 31d3b3b5d5f48c48ba96b6565b6bcc59e9272879 (patch) | |
| tree | 59cc5372ea83322fba8a13c16b4b787e682d9e75 | |
| parent | 706809adb23ef29592c7b087ca6205e6872012e7 (diff) | |
| download | ffmpeg-31d3b3b5d5f48c48ba96b6565b6bcc59e9272879.tar.gz | |
Fix compilation condition for some ProRes dsp encoder functions.
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>
| -rw-r--r-- | libavcodec/proresdsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index ad1effcae4..a21003cc22 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -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, |