[ffmpeg] (3 commits) ...Merge branch 'master' into f34
Summary of changes:
85374f4... Switch to clang instead of nvcc (*)
fb4a456... Merge branch 'master' into f34 (*)
1a34090... Merge branch 'master' into f34 (*)
(*) This commit already existed in another branch; no separate mail sent