[FFmpeg-cvslog] Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr  9 20:39:56 2015 +0200| [7ef59803e80952ae9392d86c85f1fcf408cdfcd2] | committer: Michael Niedermayer

Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'

* commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589':
  hqx: Fix clipping error in idct put function

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

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