Merge commit 'a43905f4ae261bdde87c300901d867b31961f57b'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:31:33 +0000 (11:31 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:31:33 +0000 (11:31 +0100)
* commit 'a43905f4ae261bdde87c300901d867b31961f57b':
  qsvenc_hevc: improve the default settings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/qsvenc_hevc.c

Simple merge