Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:10:31 +0000 (00:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:10:31 +0000 (00:10 +0100)
commit153557dfcb10eeebfb82b6b5b679a53e2df98bee
tree88b018c0c8e7dfbdcd229bd853cd376a81bf1793
parentea2bd139b75d1bae66bcd28f43e10e4d2f93c767
parent8199bb7be0db423bcbbd252d092386634fcf1d68
Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'

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

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.h