Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:46:57 +0000 (17:46 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 22 Nov 2015 17:46:57 +0000 (17:46 +0000)
commit98540a2c7d797061ab8f0b61018bb218f94a1215
treef87af6e795b25ac80849bdb8e3ad61d35eb746fb
parent09f9ef8536efa563350af98a99023185cec1fbe8
parent4d8f536b535487063a08609636e712ad86d2ad54
Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'

* commit '4d8f536b535487063a08609636e712ad86d2ad54':
  qsvenc: print the actual video parameters used by MSDK

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