Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:40:30 +0000 (19:40 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 18:40:39 +0000 (19:40 +0100)
These are all trivial to merge.

* commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12':
  vaapi_h265: Add -qp option, use it to replace use of -global_quality
  vaapi_h265: Add constant-bitrate encode support
  vaapi_h264: Add encode quality option (for quality-speed tradeoff)
  vaapi_h264: Add -qp option, use it to replace use of -global_quality
  vaapi_encode: Add support for codec-local options
  vaapi_h264: Add constant-bitrate encode support
  vaapi_encode: Refactor slightly to allow easier setting of global options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
libavcodec/vaapi_encode.c
libavcodec/vaapi_encode.h
libavcodec/vaapi_encode_h264.c
libavcodec/vaapi_encode_h265.c
libavcodec/vaapi_encode_mjpeg.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge