[FFmpeg-cvslog] Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  6 11:24:54 2013 +0200| [d0b27036763fca5d1bc0286dc52237fdab4050ee] | committer: Michael Niedermayer

Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0b27036763fca5d1bc0286dc52237fdab4050ee
---