diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2012-02-17 09:46:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-17 16:49:30 +0100 |
| commit | 857d14863d323c484e00fd4a553b3e28af35400f (patch) | |
| tree | d4ffd17a595daa7c77fa9c1b06d331a7c465cb4e | |
| parent | a0e44414dfc4ab2d9aa5fdd207fa6ea5f39658e8 (diff) | |
| download | ffmpeg-857d14863d323c484e00fd4a553b3e28af35400f.tar.gz | |
prores: initialise encoder and decoder parts only when needed
| -rw-r--r-- | libavcodec/proresdsp.c | 12 |
1 files changed, 10 insertions, 2 deletions
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 } |