From: Clément Bœsch <cboesch@gopro.com>
Date: Thu, 30 Mar 2017 08:07:00 +0000 (+0200)
Subject: Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'
X-Git-Tag: n3.4-dev~162
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/4f96c11ed74342a88346fe7972c71514cc98b320

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@gopro.com>
---

4f96c11ed74342a88346fe7972c71514cc98b320