[FFmpeg-cvslog] Fix compilation condition for some ProRes dsp encoder functions.

Carl Eugen Hoyos git at videolan.org
Mon Jun 4 12:20:06 CEST 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Jun  4 12:18:56 2012 +0200| [568a5924180b0ce43e2706bf2491b70c455eb36a] | committer: Carl Eugen Hoyos

Fix compilation condition for some ProRes dsp encoder functions.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=568a5924180b0ce43e2706bf2491b70c455eb36a
---

 libavcodec/proresdsp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index ad1effc..a21003c 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,



More information about the ffmpeg-cvslog mailing list