Merge commit '89923e418b494e337683442ab896d754bc07341a'

* commit '89923e418b494e337683442ab896d754bc07341a':
  lavu: add a framework for handling hwaccel frames

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

1 files changed, 6 insertions, 0 deletions

diff --git a/libavutil/frame.h b/libavutil/frame.h
index 8dc4049072..aadc796880 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -422,6 +422,12 @@ typedef struct AVFrame {
     enum AVChromaLocation chroma_location;
 
     /**
+     * For hwaccel-format frames, this should be a reference to the
+     * AVHWFramesContext describing the frame.
+     */
+    AVBufferRef *hw_frames_ctx;
+
+    /**
      * frame timestamp estimated using various heuristics, in stream time base
      * Code outside libavutil should access this field using:
      * av_frame_get_best_effort_timestamp(frame)