Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:08:35 +0000 (01:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Jul 2014 23:08:57 +0000 (01:08 +0200)
commitcf8c44fc47330833fadc505dfef2c2c1ae03a561
treea0bdeb3e3eaafae22424ac538437cf801a39e562
parentb28fcbba0c278f9db5d29c9629aa3f70a4b48cd7
parentc6698dfe7cdbc7634f33245875488ed3fa4a8ced
Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

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