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/wmv2dsp.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/wmv2dsp.c')
| -rw-r--r-- | libavcodec/wmv2dsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmv2dsp.c b/libavcodec/wmv2dsp.c index 511cc548ee..70a22c66a8 100644 --- a/libavcodec/wmv2dsp.c +++ b/libavcodec/wmv2dsp.c @@ -252,7 +252,7 @@ av_cold void ff_wmv2dsp_init(WMV2DSPContext *c) { c->idct_add = wmv2_idct_add_c; c->idct_put = wmv2_idct_put_c; - c->idct_perm = FF_NO_IDCT_PERM; + c->idct_perm = FF_IDCT_PERM_NONE; c->put_mspel_pixels_tab[0] = ff_put_pixels8x8_c; c->put_mspel_pixels_tab[1] = put_mspel8_mc10_c; |