Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:27:48 +0000 (00:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Jun 2013 22:34:07 +0000 (00:34 +0200)
commit85a3d20da55ff0eafff8ff6a3e52d52204fc6fd7
tree9f1ee64c89bd03f6ca21c29d835647d42dc3a511
parenta4a2e894fca19e284c28a4114d7718bf5588dfa1
parentf52edef30197735bfb937e9e723ab1e7b31165c6
Merge commit 'f52edef30197735bfb937e9e723ab1e7b31165c6'

* commit 'f52edef30197735bfb937e9e723ab1e7b31165c6':
  smacker: fix an off by one in huff.length computation

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