[FFmpeg-cvslog] Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  3 21:29:38 2013 +0200| [2ece7d94bc35ba0ee2b650caec25853b9fcc2eb7] | committer: Michael Niedermayer

Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'

* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
  Use correct Doxygen syntax

Conflicts:
	libavcodec/atrac3.c

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

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