[FFmpeg-cvslog] Merge commit '3ad825793a43253154bed05827f27425fc0757df'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Sep 26 16:27:43 2017 -0300| [e7c91850531aae4c2e1bf1afc62fc1d910f8736c] | committer: James Almer

Merge commit '3ad825793a43253154bed05827f27425fc0757df'

* commit '3ad825793a43253154bed05827f27425fc0757df':
  hwcontext_cuda: implement frames_get_constraints

This commit is a noop, c16fe1432d88f87a96be9e943e0f1229543ad61d

Merged-by: James Almer <jamrial at gmail.com>

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