]> git.sesse.net Git - ffmpeg/commit
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:51:45 +0000 (16:51 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 16 Feb 2016 16:51:45 +0000 (16:51 +0000)
commitc63da6e91630b72fa5916314910cb35e82331f70
tree14404ba40f2700a4e38eb81d34693a35e2a8b1bb
parent32766877b4e1a7eeacfbca50c55d55ce8bb7b73d
parent9cac1b4b4f1532fb2aeef54799285360656be5eb
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'

* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
  qsvenc: Add private option to replace coder_type

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