projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a574589 67c65e4)
Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)
* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4

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

Trivial merge
FFmpeg git repo