Merge commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:18:08 +0000 (15:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:18:08 +0000 (15:18 +0100)
commit24563c20f181cb9d7015e9595d9cb6846cf02dfa
treec995d5a498babc3ffbd1254376de4b1b27e7e6c1
parent7a9b4427b51eb14e1729f66268ebe794bddde581
parente7d7cf86dcaba8eaaed62c80172ff0aff2588c2a
Merge commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a'

* commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a':
  qsvenc: support more RC methods

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