[FFmpeg-cvslog] Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  5 03:25:52 2014 +0100| [6e380cc28f25c80f4a5fab4faa726fbdf90de7f9] | committer: Michael Niedermayer

Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'

* commit '9ecb858775483a76c137e8e1ad45a95e318bca61':
  doxy: Format @code blocks so they render properly

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

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