[FFmpeg-cvslog] Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 22:35:14 2015 +0200| [be920e4820efe310956627074c4d04f963a327aa] | committer: Michael Niedermayer

Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'

* commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9':
  libavcodec: Clarify the documentation of the internal codec capability flags

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

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