]> git.sesse.net Git - ffmpeg/commit
Merge commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 14:28:20 +0000 (14:28 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 24 Feb 2016 14:28:20 +0000 (14:28 +0000)
commit1f32d01de217fc8314e3b387db77aee628e283cc
tree4137fac987358edc12f0e466661ee3844fcc56e5
parent10fa50c156ead31423e0f787c2152aeab841c2f3
parentc51b2c79a7ba084253e892c56dd49ee97115c7de
Merge commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de'

This commit is a no-op. We already have such functionality.

* commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de':
  Allow linking to CUDA dynamically instead of dlopen()ing it at runtime

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>