diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-18 11:30:55 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-07-18 07:51:03 -0700 |
| commit | b4987f72197e0c62cf2633bf835a9c32d2a445ae (patch) | |
| tree | 4e8cce0604eeea25ac63f7fe345b572bac6f6ac8 /libavcodec/arm | |
| parent | c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46 (diff) | |
idct: Convert IDCT permutation #defines to an enum
Also rename the enum values to be consistent with other DCT permutations.
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 b4d189902d..e61bf83d0d 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 e2492a5da7..20373316a8 100644 --- a/libavcodec/arm/idctdsp_init_armv5te.c +++ b/libavcodec/arm/idctdsp_init_armv5te.c @@ -38,6 +38,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 e92f471220..dbf3647940 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 17905973fb..6dcda250ac 100644 --- a/libavcodec/arm/idctdsp_init_neon.c +++ b/libavcodec/arm/idctdsp_init_neon.c @@ -43,7 +43,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; } } |