Skip to content
Commit f2df60e2 authored by John Wiegley's avatar John Wiegley
Browse files

Merge pull request #7047 from codyopel/ffmpeg-darwin 

ffmpeg: improve cross platform support & fix licensing issues, resolves #7013
parents 9c6e5527 a5f065d7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment