Merge commit '6f54dc43'

* commit '6f54dc43':
  mpegvideo: Drop stream_codec_tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/mpegvideo.h

@@ -249,7 +249,6 @@ typedef struct MpegEncContext {
     int strict_std_compliance; ///< strictly follow the std (MPEG4, ...)
     int workaround_bugs;       ///< workaround bugs in encoders which cannot be detected automatically
     int codec_tag;             ///< internal codec_tag upper case converted from avctx codec_tag
-    int stream_codec_tag;      ///< internal stream_codec_tag upper case converted from avctx stream_codec_tag
     /* the following fields are managed internally by the encoder */
 
     /* sequence parameters */