[FFmpeg-cvslog] Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 14 13:53:55 2014 +0200| [6a72260e6baf38403c8c26d010425f52dea7817a] | committer: Michael Niedermayer

Merge commit 'a738540366c9b114949b7914c0d08e2c28982cfb'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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