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>

1 files changed, 2 insertions, 2 deletions

diff --git a/libavcodec/xvididct.c b/libavcodec/xvididct.c
index d781f7903d..9f3dab805c 100644
--- a/libavcodec/xvididct.c
+++ b/libavcodec/xvididct.c
@@ -34,7 +34,7 @@ static void idct_xvid_add(uint8_t *dest, int line_size, int16_t *block)
     ff_add_pixels_clamped(block, dest, line_size);
 }
 
-av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx)
+av_cold void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx)
 {
     const unsigned high_bit_depth = avctx->bits_per_raw_sample > 8;
 
@@ -51,7 +51,7 @@ av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx)
     }
 
     if (ARCH_X86)
-        ff_xvididct_init_x86(c);
+        ff_xvid_idct_init_x86(c);
 
     ff_init_scantable_permutation(c->idct_permutation, c->perm_type);
 }