small compile fixes
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Conflicts:
	Utilities/BEType.h
gcc..
fix the typo.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge https://github.com/Nekotekina/rpcs3
get ffmpeg working with cmake..
add ffmpeg to link..
fix gcc complain about non-const reference...
not sure about it.. but compiles..
merge branch 'master' of https://github.com/DHrpcs3/rpcs3 into crypto
fix gcc compile...
more fixes...
Merge pull request #90 from Aishou/master

Linux compilation fixes