diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 14:46:24 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 15:07:06 -0300 |
| commit | 4391d6cb8180f1261e38a588b7c4ffc457531cb2 (patch) | |
| tree | 395a644768e01bc663a00be797119c302929b58e /libavfilter/allfilters.c | |
| parent | 64f9188aae2d5b9f94550285385c0110ea784226 (diff) | |
| parent | a5a6ac1a123a927e5bed984ed757a29b7ff87dab (diff) | |
| download | ffmpeg-4391d6cb8180f1261e38a588b7c4ffc457531cb2.tar.gz | |
Merge commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab'
* commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab':
libavfilter/overlay_qsv: Add QSV overlay vpp filter
libavfilter/vf_vpp: Add common filters of the qsv vpp
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/allfilters.c')
| -rw-r--r-- | libavfilter/allfilters.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 9b672a7a7e..3647a111ec 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -260,6 +260,7 @@ static void register_all(void) REGISTER_FILTER(OCV, ocv, vf); REGISTER_FILTER(OSCILLOSCOPE, oscilloscope, vf); REGISTER_FILTER(OVERLAY, overlay, vf); + REGISTER_FILTER(OVERLAY_QSV, overlay_qsv, vf); REGISTER_FILTER(OWDENOISE, owdenoise, vf); REGISTER_FILTER(PAD, pad, vf); REGISTER_FILTER(PALETTEGEN, palettegen, vf); @@ -343,6 +344,7 @@ static void register_all(void) REGISTER_FILTER(VIDSTABTRANSFORM, vidstabtransform, vf); REGISTER_FILTER(VIGNETTE, vignette, vf); REGISTER_FILTER(VMAFMOTION, vmafmotion, vf); + REGISTER_FILTER(VPP_QSV, vpp_qsv, vf); REGISTER_FILTER(VSTACK, vstack, vf); REGISTER_FILTER(W3FDIF, w3fdif, vf); REGISTER_FILTER(WAVEFORM, waveform, vf); |