diff options
author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-03-29 23:39:40 +0200 |
---|---|---|
committer | Matthieu Bouron <matthieu.bouron@gmail.com> | 2017-03-30 00:02:08 +0200 |
commit | b5e1ec5660692d7cee360da3ed0434d3b46f40d5 (patch) | |
tree | 853ecad2f21623a52a15577dca710c337823a6c6 /libavfilter/vf_hwupload.c | |
parent | 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4 (diff) | |
parent | e3fb74f7f9a8f1895381355f40c92cac3c1023d9 (diff) | |
download | ffmpeg-b5e1ec5660692d7cee360da3ed0434d3b46f40d5.tar.gz |
Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'
* commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9':
lavfi: Always propagate hw_frames_ctx through links
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Diffstat (limited to 'libavfilter/vf_hwupload.c')
-rw-r--r-- | libavfilter/vf_hwupload.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c index 9237253f23..157686b7b3 100644 --- a/libavfilter/vf_hwupload.c +++ b/libavfilter/vf_hwupload.c @@ -231,4 +231,5 @@ AVFilter ff_vf_hwupload = { .priv_class = &hwupload_class, .inputs = hwupload_inputs, .outputs = hwupload_outputs, + .flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE, }; |