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)
commitb27ba2e540b873fe8e50280a734194ada002a077
treeab788acddcf6a588e2007488defd2c763b6c7dba
parentaeead427896a632c09c13c2b90ba096bf8678ef1
parent6e81597d5a89f64dfab5c7e99e46b4355139e324
Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'

* commit '6e81597d5a89f64dfab5c7e99e46b4355139e324':
  mpeg4videodec: move enhancement_type from MpegEncContext to Mpeg4DecContext

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