Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 21:41:08 +0000 (23:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 21:41:51 +0000 (23:41 +0200)
commitd177f275170c968837dc0c00bc1f1f3b59426e93
treeb274fe17d0b8031e7fa75ca846277960849d30b5
parent788cf6f0c60739653a1ded8d1fd79a805a16d530
parentcc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94
Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/version.h