Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:01:42 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:01:54 +0000 (21:01 +0200)
* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
  x86: xvid_idct: Drop unused definitions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/idct_mmx_xvid.c
libavcodec/x86/idct_sse2_xvid.c

Simple merge
Simple merge