Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:22:53 +0000 (15:22 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:22:53 +0000 (15:22 +0100)
commit5bc9c7a6db1caaae2bbc2061f16af28695a6fdd6
treeaa392fc97221a53e8308d8a6277a482c88bf44c1
parent24563c20f181cb9d7015e9595d9cb6846cf02dfa
parentfc4c27c4edfc6a5f9bc7c696e823652474a65ce8
Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c
libavcodec/qsvenc_mpeg2.c