Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:09:30 +0000 (21:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:09:30 +0000 (21:09 +0200)
commitb3b05a11d31d544025c0400a1c6bc70124300a86
tree66dd99b2b70d25bcb2319225f6a710710f29205f
parent3ff5ca89fc8783cabed56887f556bdd83279ffb0
parentdcb7c868ec7af7d3a138b3254ef2e08f074d8ec5
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>
libavcodec/idctdsp.c
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct.h
libavcodec/x86/xvididct_init.c
libavcodec/x86/xvididct_mmx.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c
libavcodec/xvididct.h