[FFmpeg-cvslog] Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:10:31 2014 +0100| [153557dfcb10eeebfb82b6b5b679a53e2df98bee] | committer: Michael Niedermayer

Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'

* commit '8199bb7be0db423bcbbd252d092386634fcf1d68':
  dsputil.h: Clean up comments

Conflicts:
	libavcodec/dsputil.h

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

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