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)
* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

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

Simple merge