[FFmpeg-cvslog] Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul  7 00:32:29 2014 +0200| [52ea7ffdfbfc46c6936963328f3311fd936f256b] | committer: Michael Niedermayer

Merge commit 'd69243d39b773b64614792487cd93f6ceb237b25'

* commit 'd69243d39b773b64614792487cd93f6ceb237b25':
  samplefmt: Add doxygen categories

Conflicts:
	libavutil/samplefmt.h

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

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