Merge commit '436ced244fadcde2c0b925627920e84b25482542'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jul 2014 16:53:21 +0000 (18:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jul 2014 16:53:34 +0000 (18:53 +0200)
commitce8e27e0ed2d4de3644f1e5b2cfdf5890c56f1aa
tree6c18a8d7c0c3e3d79ac7ef29ff75518dc03ccd81
parent7923aa0fba6b7b55ebbe1af8b7620060f36a1133
parent436ced244fadcde2c0b925627920e84b25482542
Merge commit '436ced244fadcde2c0b925627920e84b25482542'

* commit '436ced244fadcde2c0b925627920e84b25482542':
  mpegenccontext: Remove unused opaque pointer

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