Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:15:41 +0000 (04:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 03:15:46 +0000 (04:15 +0100)
* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
  mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

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

No differences found