diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 21:55:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-18 22:01:17 +0200 |
| commit | 42d326353c17085a98f0e81844f0c6320d70e8f3 (patch) | |
| tree | b3ca4f4affde4d81b6e6f826828fdbaecb9d2a17 /libavcodec/proresdsp.c | |
| parent | f6ed5df9c00c3fda2571ccc75e3055c215e4fc1a (diff) | |
| parent | b4987f72197e0c62cf2633bf835a9c32d2a445ae (diff) | |
Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'
* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
idct: Convert IDCT permutation #defines to an enum
Conflicts:
libavcodec/idctdsp.c
libavcodec/x86/cavsdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdsp.c')
| -rw-r--r-- | libavcodec/proresdsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresdsp.c b/libavcodec/proresdsp.c index e628554933..82d6009b58 100644 --- a/libavcodec/proresdsp.c +++ b/libavcodec/proresdsp.c @@ -58,7 +58,7 @@ static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const av_cold void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx) { dsp->idct_put = prores_idct_put_c; - dsp->idct_permutation_type = FF_NO_IDCT_PERM; + dsp->idct_permutation_type = FF_IDCT_PERM_NONE; if (ARCH_X86) ff_proresdsp_init_x86(dsp, avctx); |