[FFmpeg-cvslog] Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <cboesch at gopro.com> | Thu Mar 30 10:07:00 2017 +0200| [4f96c11ed74342a88346fe7972c71514cc98b320] | committer: Clément Bœsch

Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'

* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4

Merged-by: Clément Bœsch <cboesch at gopro.com>

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