[FFmpeg-cvslog] Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  1 04:19:08 2014 +0200| [97b88096dcbeef286a1f244f65ca4e7b922f316b] | committer: Michael Niedermayer

Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

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

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