diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-23 11:16:11 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-23 11:16:11 +0100 |
| commit | 553d8a9ecf16d10a786b9b8687b6d0a080fa53f8 (patch) | |
| tree | e8baddc71dbd529b9759d29a12391b9812db9ff0 /libavfilter/vf_midequalizer.c | |
| parent | d521258b19a54f4ada61d24b9adb15d5993eda1c (diff) | |
| parent | b8cac1e83066aa87e8402c146c81b77a11b5eec3 (diff) | |
| download | ffmpeg-553d8a9ecf16d10a786b9b8687b6d0a080fa53f8.tar.gz | |
Merge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'
* commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3':
vaapi_h265: Fix buffering parameters
vaapi_h265: Fix slice header writing
vaapi_h264: Write bitstream restriction fields
vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
vaapi_encode: Decide on GOP setup before initialising sequence parameters
This merge is a noop, see:
30ebabca7c vaapi_h265: Fix buffering parameters
ae0230cc3e vaapi_h265: Fix slice header writing
6796e6ea84 vaapi_h264: Write bitstream restriction fields
658c5afaa0 vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
ded1859df1 vaapi_encode: Decide on GOP setup before initialising sequence parameters
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavfilter/vf_midequalizer.c')
0 files changed, 0 insertions, 0 deletions