Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:20:04 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jul 2014 18:20:08 +0000 (20:20 +0200)
commit97d2b8d6f5a4b75ad80a265c30604870ebb97470
tree1b33dda8fd543474a249582c4ceca08e04ffe5bd
parentb6a6459a24c6279502abeae064c28c1187fd0b0f
parenteac77fcd56fc2a3391f0d86faf54302afb368ff7
Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'

* commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7':
  mpegenccontext: Remove unused dct_unquantize_h261 function pointers

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