ffmpeg submodule added
Work on demuxer, ffmpeg libs linked
Demuxer improved, cellPamf improved

File reading improved
cond/lwcond fixed
Fixed conflicts
memcpy partially replaced

Fixed one of exit issues
Some errors fixed
Merge branch 'master' of https://github.com/elisha464/rpcs3
Vpost draft
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
I cannot do anything
Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Merge pull request #89 from Nekotekina/master

...
First installment of RPCS3's custom crypto engine:

- Removed all scetool dependencies;
- Implemented a key vault to manage PS3 keys internally;
- Implemented SELF decryption;
- Improved PKG handling.

Notes:
- NPDRM SELF files (EBOOT.BIN) can also be decrypted. A valid matching RAP file must be placed under the dev_usb000 folder.
- The source code is considerably commented and several debugging functions were also added in order to aid anyone who wishes to contribute to the engine.
Fixed AboutDialog (changed in last commit).
Fixed x64 compilation errors & cellFsGetFreeSize
omg