Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 20:18:19 +0000 (21:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Mar 2015 20:18:25 +0000 (21:18 +0100)
commit66de11b064fc7184d765a1f5fe2e1280854071cc
tree9edf85fcb2b563b1ad202279f81d11bea53ebd79
parent07ca090e814e3f93680fdef555f3688822a0cdbd
parent7c60c124c8dfaebfafa2b3c11b316db549617732
Merge commit '7c60c124c8dfaebfafa2b3c11b316db549617732'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hqxvlc.c