[FFmpeg-cvslog] Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 16 23:42:08 2013 +0100| [571a99de186eac69ed0d6b0eaaaa983cae30765a] | committer: Michael Niedermayer

Merge commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf'

* commit '2ff302cb6ba1f159905888026c8a1d7dd8319acf':
  lavc: update coded_frame doxy.

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

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