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
Minor changes

* Fixed some forgotten `!` in cellFsGetFreeSize.
* Fixed VSUM2SWS opcode.
* Added cellNetCtl to the project.
* Implemented cellNetCtlGetState.
Changes in cellRtc & sceNpTrophy

* Two header files added: cellRtc.h and sceNpTrophy.h
* Changes in sceNpTrophyCreateContext.
* Implemented sceNpTrophyGetTrophyInfo.
Progress in cellL10n

* cellL10n added to the project.
* Function addresses added to cellL10n_init.
* UTF16stoUTF8s implemented (WARNING: I haven't tested it).
Conflicts fixed (again)