diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 21:09:30 +0200 |
| commit | b3b05a11d31d544025c0400a1c6bc70124300a86 (patch) | |
| tree | 66dd99b2b70d25bcb2319225f6a710710f29205f /libavcodec/idctdsp.c | |
| parent | 3ff5ca89fc8783cabed56887f556bdd83279ffb0 (diff) | |
| parent | dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5 (diff) | |
Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs
Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/idctdsp.c')
| -rw-r--r-- | libavcodec/idctdsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c index f139bacc0f..8311fab92f 100644 --- a/libavcodec/idctdsp.c +++ b/libavcodec/idctdsp.c @@ -301,7 +301,7 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx) c->add_pixels_clamped = ff_add_pixels_clamped; if (CONFIG_MPEG4_DECODER && avctx->idct_algo == FF_IDCT_XVID) - ff_xvididct_init(c, avctx); + ff_xvid_idct_init(c, avctx); if (ARCH_ALPHA) ff_idctdsp_init_alpha(c, avctx, high_bit_depth); |