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)
commitaf7c7037150d572fa791b7465cda68d2ed720e02
tree6d0506ff87b94f584978cc62d551faab03674836
parentfe41f28c3a430722dd95ef8e73bed8c7f070f51d
parent9f5d6f460ceeda8b4ac29b3249a49e275b64c706
Merge commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706'

* commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706':
  hap: Set avctx.bits_per_coded_sample

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