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 | |
| parent | f6ed5df9c00c3fda2571ccc75e3055c215e4fc1a (diff) | |
| parent | b4987f72197e0c62cf2633bf835a9c32d2a445ae (diff) | |
| download | ffmpeg-42d326353c17085a98f0e81844f0c6320d70e8f3.tar.gz | |
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')
| -rw-r--r-- | libavcodec/arm/idctdsp_init_arm.c | 4 | ||||
| -rw-r--r-- | libavcodec/arm/idctdsp_init_armv5te.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/idctdsp_init_armv6.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/idctdsp_init_neon.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c index cc5e116766..0eebe2a8bc 100644 --- a/libavcodec/arm/idctdsp_init_arm.c +++ b/libavcodec/arm/idctdsp_init_arm.c @@ -78,12 +78,12 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = j_rev_dct_arm_put; c->idct_add = j_rev_dct_arm_add; c->idct = ff_j_rev_dct_arm; - c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_LIBMPEG2; } else if (avctx->idct_algo == FF_IDCT_SIMPLEARM) { c->idct_put = simple_idct_arm_put; c->idct_add = simple_idct_arm_add; c->idct = ff_simple_idct_arm; - c->idct_permutation_type = FF_NO_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_NONE; } } diff --git a/libavcodec/arm/idctdsp_init_armv5te.c b/libavcodec/arm/idctdsp_init_armv5te.c index 9ca36879d7..c2d94e6c07 100644 --- a/libavcodec/arm/idctdsp_init_armv5te.c +++ b/libavcodec/arm/idctdsp_init_armv5te.c @@ -39,6 +39,6 @@ av_cold void ff_idctdsp_init_armv5te(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = ff_simple_idct_put_armv5te; c->idct_add = ff_simple_idct_add_armv5te; c->idct = ff_simple_idct_armv5te; - c->idct_permutation_type = FF_NO_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_NONE; } } diff --git a/libavcodec/arm/idctdsp_init_armv6.c b/libavcodec/arm/idctdsp_init_armv6.c index 27ca6cedb7..dab7ff0ca1 100644 --- a/libavcodec/arm/idctdsp_init_armv6.c +++ b/libavcodec/arm/idctdsp_init_armv6.c @@ -41,7 +41,7 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = ff_simple_idct_put_armv6; c->idct_add = ff_simple_idct_add_armv6; c->idct = ff_simple_idct_armv6; - c->idct_permutation_type = FF_LIBMPEG2_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_LIBMPEG2; } } c->add_pixels_clamped = ff_add_pixels_clamped_armv6; 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; } } |