Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:24:54 +0000 (11:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:25:22 +0000 (11:25 +0200)
commitd0b27036763fca5d1bc0286dc52237fdab4050ee
tree60085bf3f2f74ce7974a92d151062633240bc86b
parent90cecd3c9b6bf4a18f9b3f19fa5e3e2f7c1e24d9
parent0b8b2ae5e93d616c2ece59f7175f483154cff918
Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'

* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918':
  x86: xviddct: Employ more specific ifdefs

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