Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:13:19 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 13:13:33 +0000 (14:13 +0100)
* qatar/master:
  webp: add a special case for a huffman table with only 1 symbol

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

Simple merge