Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:29:05 +0000 (17:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:52:06 +0000 (17:52 +0100)
* commit '80a11de7dca315505bf203ce9c8c016e71724fd2':
  nutenc: do not use has_b_frames

Conflicts:
libavformat/nutenc.c
tests/ref/lavf/nut
tests/ref/seek/lavf-nut

Mostly not merged, this is simply not correct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/nutenc.c

@@@ -419,6 -418,8 +420,7 @@@ static int write_streamheader(AVFormatC
  {
      NUTContext *nut       = avctx->priv_data;
      AVCodecContext *codec = st->codec;
 -    unsigned codec_tag    = av_codec_get_tag(ff_nut_codec_tags, codec->codec_id);
+     const AVCodecDescriptor *desc = avcodec_descriptor_get(codec->codec_id);
  
      ff_put_v(bc, i);
      switch (codec->codec_type) {