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/arm/idctdsp_init_neon.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/arm/idctdsp_init_neon.c')
-rw-r--r-- | libavcodec/arm/idctdsp_init_neon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/idctdsp_init_neon.c b/libavcodec/arm/idctdsp_init_neon.c index d8684e7012..7cd7ae8dcd 100644 --- a/libavcodec/arm/idctdsp_init_neon.c +++ b/libavcodec/arm/idctdsp_init_neon.c @@ -44,7 +44,7 @@ av_cold void ff_idctdsp_init_neon(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = ff_simple_idct_put_neon; c->idct_add = ff_simple_idct_add_neon; c->idct = ff_simple_idct_neon; - c->idct_permutation_type = FF_PARTTRANS_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_PARTTRANS; } } |