Merge commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 06:16:43 +0000 (08:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 06:17:01 +0000 (08:17 +0200)
* commit '16ea20c827ef2ffaf77d5e05d5cf9983689f7b2b':
  lavc doxy: extend/clarify avcodec_decode_audio4() doxy

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

Simple merge