diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:40:30 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:40:39 +0100 |
| commit | 8ed427f9f92fd45c2510c019dba932acda74817f (patch) | |
| tree | 860dca02a5cf782100e7abf6a64a35ddab5f967d /ffmpeg.c | |
| parent | bc3d2f25783a4f61b7018800a12182dc46ff8325 (diff) | |
| parent | 92fdea37477b5a2d1329e5ef0773e24473fa8f12 (diff) | |
| download | ffmpeg-8ed427f9f92fd45c2510c019dba932acda74817f.tar.gz | |
Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'
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>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions