Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:05:59 +0000 (17:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:08:40 +0000 (17:08 +0100)
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavcodec/version.h

Simple merge
@@@ -1115,22 -1060,6 +1115,20 @@@ void ff_mpv_decode_defaults(MpegEncCont
      ff_mpv_common_defaults(s);
  }
  
-     s->stream_codec_tag   = avpriv_toupper4(avctx->stream_codec_tag);
 +void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx)
 +{
 +    s->avctx           = avctx;
 +    s->width           = avctx->coded_width;
 +    s->height          = avctx->coded_height;
 +    s->codec_id        = avctx->codec->id;
 +    s->workaround_bugs = avctx->workaround_bugs;
 +    s->flags           = avctx->flags;
 +    s->flags2          = avctx->flags2;
 +
 +    /* convert fourcc to upper case */
 +    s->codec_tag          = avpriv_toupper4(avctx->codec_tag);
 +}
 +
  static int init_er(MpegEncContext *s)
  {
      ERContext *er = &s->er;
Simple merge
Simple merge