Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'

* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
  lavfi: generic hardware surface upload and download filters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 835a519173..79227a7ea0 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -344,6 +344,15 @@ struct AVFilterContext {
      */
     AVFilterInternal *internal;
 
+    /**
+     * For filters which will create hardware frames, sets the device the
+     * filter should create them in.  All other filters will ignore this field:
+     * in particular, a filter which consumes or processes hardware frames will
+     * instead use the hw_frames_ctx field in AVFilterLink to carry the
+     * hardware context information.
+     */
+    AVBufferRef *hw_device_ctx;
+
     struct AVFilterCommand *command_queue;
 
     char *enable_str;               ///< enable expression string