[FFmpeg-cvslog] Merge commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Oct 27 14:06:45 2015 +0100| [af7c7037150d572fa791b7465cda68d2ed720e02] | committer: Hendrik Leppkes

Merge commit '9f5d6f460ceeda8b4ac29b3249a49e275b64c706'

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

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

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