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)
* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

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

Simple merge