Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 22:20:48 +0000 (00:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 22:20:48 +0000 (00:20 +0200)
commitd858ee717bed6307b8e772bd5039ab001aeae03f
tree2e8d510d7c759cf58cb178c55409340bab048161
parentb50559fc0b2bb4c1ac85aad2e9b0122fe4ec53a3
parent6d212599aa684f30511fb08ca30fe2378405304e
Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'

* commit '6d212599aa684f30511fb08ca30fe2378405304e':
  avformat: Provide a standard compliance flag

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavformat/avformat.h
libavformat/options_table.h
libavformat/version.h