This reverts commit de32d89fc6.
Fixes an issue where Linux CI builds fail because FFmpeg fails to
compile. Using FFmpeg git master in CI builds was obviously not the
smartest idea because changes in FFmpeg can break things unexpectedly.
Sorry about that.
The reason for the original commit was that OBS failed to compile
with FFmpeg 2.4. That has been fixed since.
Thomas Crider
juvester
Jim
juvester