[FFmpeg-cvslog] Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 21:01:42 2014 +0200| [3ff5ca89fc8783cabed56887f556bdd83279ffb0] | committer: Michael Niedermayer

Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

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

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

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