Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:42:08 +0000 (23:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:42:18 +0000 (23:42 +0100)
* commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf':
  lavc: update coded_frame doxy.

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

Simple merge