[FFmpeg-cvslog] Merge commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb 24 14:28:20 2016 +0000| [1f32d01de217fc8314e3b387db77aee628e283cc] | committer: Derek Buitenhuis

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 at gmail.com>

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