Merge commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e'
authorJames Almer <jamrial@gmail.com>
Thu, 30 Nov 2017 00:04:33 +0000 (21:04 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 30 Nov 2017 00:05:57 +0000 (21:05 -0300)
commitdde7b1d4857fa710113d1fc365bc4ea7707e3156
tree5cb0791a9c6126ef62a12f8fbe71487563518f87
parentb0d9eab7f202f439b7c28e23ed1852abc814cd52
parentb843b343d8a3210ae37a2342b1904a5bd1e5fc6e
Merge commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e'

* commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e':
  qsvenc: cavlc option is only available for h264

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c