Merge commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:06:45 +0000 (14:06 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 13:06:45 +0000 (14:06 +0100)
* commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706':
  hap: Set avctx.bits_per_coded_sample

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

Trivial merge