[FFmpeg-cvslog] Merge commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Sep  8 14:17:04 2015 +0200| [b7ce3aefecea82def818a203839c2e610f145bf4] | committer: Hendrik Leppkes

Merge commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda'

* commit '26960aa1cd865e5dc55c67fb2ff9f0629e4d1bda':
  huffman: increase bits constant

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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