Merge commit 'fb8753ada23189076bdf903c1c001c0ca8287fae'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 24 Nov 2015 13:48:28 +0000 (13:48 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 24 Nov 2015 13:48:28 +0000 (13:48 +0000)
commit9c35b8e219549c81e9a73a9b5a38be36b9c98181
treec0707dcec7a267610f23fb48ecac9652e59222b1
parent12a419dacb479d663f04e316f9997568ef326965
parentfb8753ada23189076bdf903c1c001c0ca8287fae
Merge commit 'fb8753ada23189076bdf903c1c001c0ca8287fae'

* commit 'fb8753ada23189076bdf903c1c001c0ca8287fae':
  qsvenc: factor out common options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c
libavcodec/qsvenc_mpeg2.c