[FFmpeg-cvslog] Merge commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b'

[Hendrik Leppkes]

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

Merge commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b'

* commit '741d353ab9cb47fe864e60552bf7b9af7aaa735b':
  huffman: allow specifying nb_bits to ff_huff_build_tree()

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

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