Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 12:10:01 +0000 (13:10 +0100)
* commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e':
  lavf: use the format context strict_std_compliance instead of the codec one

Conflicts:
libavformat/mux.c

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

Simple merge
@@@ -199,7 -79,7 +199,7 @@@ static int validate_codec_tag(AVFormatC
      }
      if (id != AV_CODEC_ID_NONE)
          return 0;
-     if (tag >= 0 && (st->codec->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
 -    if (tag && (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
++    if (tag >= 0 && (s->strict_std_compliance >= FF_COMPLIANCE_NORMAL))
          return 0;
      return 1;
  }