[FFmpeg-cvslog] Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 29 15:22:53 2015 +0100| [5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6] | committer: Hendrik Leppkes

Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'

* commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8':
  qsvenc: expose additional encoding options

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

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