Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
  x86: xvid_idct: Drop unused definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/x86/idct_mmx_xvid.c
Simple merge

diff --cc libavcodec/x86/idct_sse2_xvid.c
Simple merge