Revert changes that require swresample library.  Need to find a way to support both swresample and avresample libraries.