Merge commit '08bb2567586599d62a282c4cd31567a0807f3d92'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:39:47 +0000 (23:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 21:40:51 +0000 (23:40 +0200)
* commit '08bb2567586599d62a282c4cd31567a0807f3d92':
  lavc: document which parts of AVHWAccel are private.

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

Simple merge