diff options
author | James Almer <jamrial@gmail.com> | 2017-10-30 17:02:43 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-30 17:02:43 -0300 |
commit | 623a0526282f97c567c6bfc669828d7382abe0ad (patch) | |
tree | 792f73e38fac802369f02a9beb76b76fd4c3ec72 /libavutil/x86/cpu.h | |
parent | 644dd659c5c2927d5fb944718c32e61d88a0791b (diff) | |
parent | 7acb90333a187b0e847b66f9d3511245423dc0ce (diff) | |
download | ffmpeg-623a0526282f97c567c6bfc669828d7382abe0ad.tar.gz |
Merge commit '7acb90333a187b0e847b66f9d3511245423dc0ce'
* commit '7acb90333a187b0e847b66f9d3511245423dc0ce':
vaapi: Add external control of allow-profile-mismatch
lavc: Add flag to allow profile mismatch with hardware decoding
vaapi_encode: Use gop_size consistently in RC parameters
This commit is a noop, see
b658b5399e5d75cec44b09d79b00f59fa83cca43
49ae8a5e87f99b15514f5ef075d801e9ea8374e9
38820631746f86a2252c71ed4a588eb679dd9f40
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/x86/cpu.h')
0 files changed, 0 insertions, 0 deletions