[FFmpeg-cvslog] Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 17 21:18:19 2015 +0100| [66de11b064fc7184d765a1f5fe2e1280854071cc] | committer: Michael Niedermayer

Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'

* commit '7c60c124c8dfaebfafa2b3c11b316db549617732':
  hqx: Drop unused offsets table

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

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