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)
commit042eba52a5ff4939b8c548a9fb5e209790c17b37
tree418842b474845621da39f48de2ceaaee3874aba8
parentc04c43b3e423d0426162828e7b180e4d0014a3f7
parent91e8d2eb1f7bf3af949008b106ec1ca037b88b0e
Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

* 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>
libavformat/movenc.c
libavformat/mux.c