diff options
| author | Mark Thompson <sw@jkqxz.net> | 2019-02-28 00:38:08 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2019-06-02 17:30:41 +0100 |
| commit | 5051b7f898aebb77291f2b1c97a53e84b4c34256 (patch) | |
| tree | 160912b48a1f66c83853b74874a4327af5cd6466 /libavfilter/vf_scale_vaapi.c | |
| parent | 5fb9eb9ed256d772609377ce356b8e22de9611d2 (diff) | |
lavfi/vaapi: Improve support for colour properties
Attempts to pick the set of supported colour properties best matching the
input. Output is then set with the same values, except for the colour
matrix which may change when converting between RGB and YUV.
Diffstat (limited to 'libavfilter/vf_scale_vaapi.c')
| -rw-r--r-- | libavfilter/vf_scale_vaapi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_scale_vaapi.c b/libavfilter/vf_scale_vaapi.c index 369daa787b..ae2471b821 100644 --- a/libavfilter/vf_scale_vaapi.c +++ b/libavfilter/vf_scale_vaapi.c @@ -106,6 +106,10 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) goto fail; } + err = av_frame_copy_props(output_frame, input_frame); + if (err < 0) + return err; + err = ff_vaapi_vpp_init_params(avctx, ¶ms, input_frame, output_frame); if (err < 0) @@ -117,10 +121,6 @@ static int scale_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) if (err < 0) goto fail; - err = av_frame_copy_props(output_frame, input_frame); - if (err < 0) - goto fail; - av_frame_free(&input_frame); av_log(avctx, AV_LOG_DEBUG, "Filter output: %s, %ux%u (%"PRId64"), mode: %s.\n", |