Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-18 23:55:55 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-07-19 00:01:17 +0400
commit42d326353c17085a98f0e81844f0c6320d70e8f3 (patch)
treeb3ca4f4affde4d81b6e6f826828fdbaecb9d2a17 /libavcodec/cavsdsp.c
parentf6ed5df9c00c3fda2571ccc75e3055c215e4fc1a (diff)
parentb4987f72197e0c62cf2633bf835a9c32d2a445ae (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/cavsdsp.c')
-rw-r--r--libavcodec/cavsdsp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cavsdsp.c b/libavcodec/cavsdsp.c
index 6ca11b9564..41d54b26e5 100644
--- a/libavcodec/cavsdsp.c
+++ b/libavcodec/cavsdsp.c
@@ -561,7 +561,7 @@ av_cold void ff_cavsdsp_init(CAVSDSPContext* c, AVCodecContext *avctx) {
c->cavs_filter_cv = cavs_filter_cv_c;
c->cavs_filter_ch = cavs_filter_ch_c;
c->cavs_idct8_add = cavs_idct8_add_c;
- c->idct_perm = FF_NO_IDCT_PERM;
+ c->idct_perm = FF_IDCT_PERM_NONE;
if (ARCH_X86)
ff_cavsdsp_init_x86(c, avctx);