* commit '91e8d2eb':
  lavf: use the format context strict_std_compliance instead of the codec one

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