Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 11:53:55 +0000 (13:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 11:54:21 +0000 (13:54 +0200)
commit6a72260e6baf38403c8c26d010425f52dea7817a
tree01e165470e429be6a7ffac55b943d86f954b9989
parentbc2e39c4cc35e8b08ca2ba45496ab3048ae7a426
parenta738540366c9b114949b7914c0d08e2c28982cfb
Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'

* commit 'a738540366c9b114949b7914c0d08e2c28982cfb':
  lavf: properly document the distinction between flags and ctx_flags

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