Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:35:14 +0000 (22:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Apr 2015 20:35:19 +0000 (22:35 +0200)
commitbe920e4820efe310956627074c4d04f963a327aa
treed814802049d84181da8664022249a9da105d73f1
parentdb4ac46fed9b12e3597903c5e99cce146bb05c7e
parent5637ff01218a44fcc1fff9b4382a15a6470abcc9
Merge commit '5637ff01218a44fcc1fff9b4382a15a6470abcc9'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/internal.h