[FFmpeg-cvslog] Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 23:41:08 2014 +0200| [d177f275170c968837dc0c00bc1f1f3b59426e93] | committer: Michael Niedermayer

Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'

* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

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

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