[FFmpeg-cvslog] Merge commit '82bb3048013201c0095d2853d4623633d912252f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 20 22:26:58 2014 +0100| [e98bac82e5152f492ef05deff562abb2c68ec2ca] | committer: Michael Niedermayer

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

* commit '82bb3048013201c0095d2853d4623633d912252f':
  dsputil: Use correct type in me_cmp_func function pointer

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

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