* commit '6d212599aa684f30511fb08ca30fe2378405304e': avformat: Provide a standard compliance flag Conflicts: doc/APIchanges libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>