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/x86/idctdsp_init.c | |
| 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/x86/idctdsp_init.c')
| -rw-r--r-- | libavcodec/x86/idctdsp_init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index b2332b2d4e..0a9432e59e 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -41,16 +41,16 @@ static const uint8_t simple_mmx_permutation[64] = { static const uint8_t idct_sse2_row_perm[8] = { 0, 4, 1, 5, 2, 6, 3, 7 }; av_cold int ff_init_scantable_permutation_x86(uint8_t *idct_permutation, - int idct_permutation_type) + enum idct_permutation_type perm_type) { int i; - switch (idct_permutation_type) { - case FF_SIMPLE_IDCT_PERM: + switch (perm_type) { + case FF_IDCT_PERM_SIMPLE: for (i = 0; i < 64; i++) idct_permutation[i] = simple_mmx_permutation[i]; return 1; - case FF_SSE2_IDCT_PERM: + case FF_IDCT_PERM_SSE2: for (i = 0; i < 64; i++) idct_permutation[i] = (i & 0x38) | idct_sse2_row_perm[i & 7]; return 1; @@ -76,7 +76,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = ff_simple_idct_put_mmx; c->idct_add = ff_simple_idct_add_mmx; c->idct = ff_simple_idct_mmx; - c->idct_permutation_type = FF_SIMPLE_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_SIMPLE; break; case FF_IDCT_XVIDMMX: c->idct_put = ff_idct_xvid_mmx_put; @@ -103,7 +103,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_put = ff_idct_xvid_sse2_put; c->idct_add = ff_idct_xvid_sse2_add; c->idct = ff_idct_xvid_sse2; - c->idct_permutation_type = FF_SSE2_IDCT_PERM; + c->perm_type = FF_IDCT_PERM_SSE2; } } if (EXTERNAL_SSE2(cpu_flags)) { |