[FFmpeg-cvslog] Merge commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 22:35:04 2016 +0100| [72c38dd66e528f4d70c103c5cfc4ebc25a21cc62] | committer: Hendrik Leppkes

Merge commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498'

* commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498':
  hwcontext: clarify the behaviour of transfer_data() for cropped frames

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72c38dd66e528f4d70c103c5cfc4ebc25a21cc62
---

 libavutil/hwcontext.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
index 5e2af09..785da09 100644
--- a/libavutil/hwcontext.h
+++ b/libavutil/hwcontext.h
@@ -318,6 +318,14 @@ int av_hwframe_get_buffer(AVBufferRef *hwframe_ctx, AVFrame *frame, int flags);
  * If dst->format is set, then this format will be used, otherwise (when
  * dst->format is AV_PIX_FMT_NONE) the first acceptable format will be chosen.
  *
+ * The two frames must have matching allocated dimensions (i.e. equal to
+ * AVHWFramesContext.width/height), since not all device types support
+ * transferring a sub-rectangle of the whole surface. The display dimensions
+ * (i.e. AVFrame.width/height) may be smaller than the allocated dimensions, but
+ * also have to be equal for both frames. When the display dimensions are
+ * smaller than the allocated dimensions, the content of the padding in the
+ * destination frame is unspecified.
+ *
  * @param dst the destination frame. dst is not touched on failure.
  * @param src the source frame.
  * @param flags currently unused, should be set to zero


======================================================================