[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 17 21:20:38 2014 +0100| [6742614c231b5e0ad2615c40afd1b71ac90d466b] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxygen: Replace @parblock syntax with manual linebreaks

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

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