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)
* commit 'a738540366c9b114949b7914c0d08e2c28982cfb':
  lavf: properly document the distinction between flags and ctx_flags

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

Simple merge