Merge commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:35:04 +0000 (22:35 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 21:35:04 +0000 (22:35 +0100)
* commit '5fcae3b3f93fd02b3d1e009b9d9b17410fca9498':
  hwcontext: clarify the behaviour of transfer_data() for cropped frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/hwcontext.h

Simple merge