From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Fri, 17 Feb 2012 08:46:53 +0000 (+0100)
Subject: prores: initialise encoder and decoder parts only when needed
X-Git-Tag: android-x86-4.4-r1~13368
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=857d14863d323c484e00fd4a553b3e28af35400f;p=android-x86%2Fexternal-ffmpeg.git

prores: initialise encoder and decoder parts only when needed
---

diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index 2195b93e2d..68c6f3e44f 100644
--- a/libavcodec/proresdsp.c
+++ b/libavcodec/proresdsp.c
@@ -29,6 +29,7 @@
 
 #define CLIP_AND_BIAS(x) (av_clip((x) + BIAS, CLIP_MIN, CLIP_MAX))
 
+#if CONFIG_PRORES_DECODER
 /**
  * Add bias value, clamp and output pixels of a slice
  */
@@ -50,7 +51,9 @@ static void prores_idct_put_c(uint16_t *out, int linesize, DCTELEM *block, const
     ff_prores_idct(block, qmat);
     put_pixels(out, linesize >> 1, block);
 }
+#endif
 
+#if CONFIG_PRORES_ENCODER
 static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block)
 {
     int x, y;
@@ -63,18 +66,23 @@ static void prores_fdct_c(const uint16_t *src, int linesize, DCTELEM *block)
     }
     ff_jpeg_fdct_islow_10(block);
 }
+#endif
 
 void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx)
 {
+#if CONFIG_PRORES_DECODER
     dsp->idct_put = prores_idct_put_c;
     dsp->idct_permutation_type = FF_NO_IDCT_PERM;
-    dsp->fdct     = prores_fdct_c;
-    dsp->dct_permutation_type  = FF_NO_IDCT_PERM;
 
     if (HAVE_MMX) ff_proresdsp_x86_init(dsp, avctx);
 
     ff_init_scantable_permutation(dsp->idct_permutation,
                                   dsp->idct_permutation_type);
+#endif
+#if CONFIG_PRORES_ENCODER
+    dsp->fdct                 = prores_fdct_c;
+    dsp->dct_permutation_type = FF_NO_IDCT_PERM;
     ff_init_scantable_permutation(dsp->dct_permutation,
                                   dsp->dct_permutation_type);
+#endif
 }