Merge commit '43af264d'

* commit '43af264d':
  mpeg4videodec: move mpeg4-specific bug workaround variables from MpegEncContext to Mpeg4DecContext

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

libavcodec/mpeg4video.h

@@ -70,6 +70,12 @@ typedef struct Mpeg4DecContext {
     int rvlc;
     ///< could this stream contain resync markers
     int resync_marker;
+
+    /* bug workarounds */
+    int divx_version;
+    int divx_build;
+    int xvid_build;
+    int lavc_build;
 } Mpeg4DecContext;
 
 /* dc encoding for mpeg4 */

libavcodec/mpegvideo.h

@@ -630,18 +630,11 @@ typedef struct MpegEncContext {
     int cplx_estimation_trash_b;
 
     /* divx specific, used to workaround (many) bugs in divx5 */
-    int divx_version;
-    int divx_build;
     int divx_packed;
     uint8_t *bitstream_buffer; //Divx 5.01 puts several frames in a single one, this is used to reorder them
     int bitstream_buffer_size;
     unsigned int allocated_bitstream_buffer_size;
 
-    int xvid_build;
-
-    /* lavc specific stuff, used to workaround bugs in libavcodec */
-    int lavc_build;
-
     /* RV10 specific */
     int rv10_version; ///< RV10 version: 0 or 3
     int rv10_first_dc_coded[3];