[FFmpeg-cvslog] Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun Nov 22 17:46:57 2015 +0000| [98540a2c7d797061ab8f0b61018bb218f94a1215] | committer: Derek Buitenhuis

Merge commit '4d8f536b535487063a08609636e712ad86d2ad54'

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

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98540a2c7d797061ab8f0b61018bb218f94a1215
---