[FFmpeg-cvslog] Merge commit '91e8d2eb1f7bf3af949008b106ec1ca037b88b0e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 13:10:01 2014 +0100| [042eba52a5ff4939b8c548a9fb5e209790c17b37] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=042eba52a5ff4939b8c548a9fb5e209790c17b37
---