git.sesse.net Git - ffmpeg/commitdiff

author	James Almer <jamrial@gmail.com>
	Sun, 10 Dec 2017 23:54:49 +0000 (20:54 -0300)
committer	James Almer <jamrial@gmail.com>
	Sun, 10 Dec 2017 23:54:49 +0000 (20:54 -0300)

* commit '3ff8fbbf5a7bc40c09db74d4952364997fd3c611':
  vaapi_h265: Add named options for setting profile and level
  vaapi_h264: Add named options for setting profile and level
  vaapi: Make the decode profile matching more explicit
  vaapi_h264: Fix VUI max_dec_frame_buffering
  vaapi_h265: Enable VBR mode

This commit is a noop, see
385cafb07ac1e46433931ea9749a134efd7350be
f31478ba1472afe5c1eed60f219ae331816425a2
efd0612fdcb7490ed371899f532d73ef8bb7cba0
c490fc9536dcea7fdf1245a340bf075533610bc2
71421f382f5c53b1a109489a906a80c1b7e3eed7

Merged-by: James Almer <jamrial@gmail.com>

Trivial merge