Merge commit '436ced24'

* commit '436ced24':
  mpegenccontext: Remove unused opaque pointer
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpegvideo.h

@@ -469,8 +469,6 @@ typedef struct MpegEncContext {
     int dct_count[2];
     uint16_t (*dct_offset)[64];
 
-    void *opaque;              ///< private data for the user
-
     /* bit rate control */
     int64_t total_bits;
     int frame_bits;                ///< bits used for the current frame