[FFmpeg-cvslog] Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct  3 21:22:55 2013 +0200| [16bb8faac6d51e342b64974ceb2f8edd7955f9fa] | committer: Michael Niedermayer

Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'

* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
  atrac: Move doxygen comments to the header

Conflicts:
	libavcodec/atrac.c
	libavcodec/atrac.h

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

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