Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2019-02-28 03:38:08 +0300
committerMark Thompson <sw@jkqxz.net>2019-06-02 19:30:41 +0300
commit5051b7f898aebb77291f2b1c97a53e84b4c34256 (patch)
tree160912b48a1f66c83853b74874a4327af5cd6466 /libavfilter/vf_misc_vaapi.c
parent5fb9eb9ed256d772609377ce356b8e22de9611d2 (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_misc_vaapi.c')
-rw-r--r--libavfilter/vf_misc_vaapi.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/vf_misc_vaapi.c b/libavfilter/vf_misc_vaapi.c
index 6fbd453741..54516d7e35 100644
--- a/libavfilter/vf_misc_vaapi.c
+++ b/libavfilter/vf_misc_vaapi.c
@@ -143,6 +143,10 @@ static int misc_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, &params,
input_frame, output_frame);
if (err < 0)
@@ -157,9 +161,6 @@ static int misc_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").\n",