[FFmpeg-cvslog] Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  4 01:08:35 2014 +0200| [cf8c44fc47330833fadc505dfef2c2c1ae03a561] | committer: Michael Niedermayer

Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

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

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

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