Merge commit '6e81597d5a89f64dfab5c7e99e46b4355139e324'

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

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

1 files changed, 1 insertions, 0 deletions

diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h
index 79e1065f3e..15fe68fc2c 100644
--- a/libavcodec/mpeg4video.h
+++ b/libavcodec/mpeg4video.h
@@ -74,6 +74,7 @@ typedef struct Mpeg4DecContext {
     int t_frame;
 
     int new_pred;
+    int enhancement_type;
 
     /* bug workarounds */
     int divx_version;