[FFmpeg-cvslog] Merge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul 15 22:43:43 2015 +0200| [cbd4a1dbdeda9178b6a59b06a04652ed5c06da19] | committer: Michael Niedermayer

Merge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'

* commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3':
  checkasm: Add unit tests for h264qpel

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

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