Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / proresdsp.c

diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c
index 739ee2b3ec5c873297eaa1d386b5168441902eae..68c6f3e44ff8d138e0551b6edc816cff327bd11b 100644 (file)
--- 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,9 +51,26 @@ 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;
+    const uint16_t *tsrc = src;
+
+    for (y = 0; y < 8; y++) {
+        for (x = 0; x < 8; x++)
+            block[y * 8 + x] = tsrc[x];
+        tsrc += linesize >> 1;
+    }
+    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;
 
@@ -60,4 +78,11 @@ void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *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
 }