Merge pull request #7639 from unknownbrackets/minor

Update ffmpeg, clean up some state on reset

Core/Dialog/PSPGamedataInstallDialog.cpp

@@ -132,7 +132,7 @@ int PSPGamedataInstallDialog::Shutdown(bool force) {
 	if (status != SCE_UTILITY_STATUS_FINISHED && !force)
 		return SCE_ERROR_UTILITY_INVALID_STATUS;
 
-	return PSPDialog::Shutdown();
+	return PSPDialog::Shutdown(force);
 }
 
 std::string PSPGamedataInstallDialog::GetGameDataInstallFileName(SceUtilityGamedataInstallParam *param, std::string filename){

Core/Dialog/PSPNetconfDialog.cpp

@@ -114,7 +114,7 @@ int PSPNetconfDialog::Shutdown(bool force) {
 	if (status != SCE_UTILITY_STATUS_FINISHED && !force)
 		return SCE_ERROR_UTILITY_INVALID_STATUS;
 
-	return PSPDialog::Shutdown();
+	return PSPDialog::Shutdown(force);
 }
 
 void PSPNetconfDialog::DoState(PointerWrap &p) {	

Core/HLE/sceDisplay.cpp

@@ -187,6 +187,7 @@ void __DisplayInit() {
 	framebuf.topaddr = 0x04000000;
 	framebuf.pspFramebufFormat = GE_FORMAT_8888;
 	framebuf.pspFramebufLinesize = 480; // ??
+	memset(&latchedFramebuf, 0, sizeof(latchedFramebuf));
 	lastFlipCycles = 0;
 	lastFlipsTooFrequent = 0;
 	wasPaused = false;
@@ -200,6 +201,7 @@ void __DisplayInit() {
 
 	CoreTiming::ScheduleEvent(msToCycles(frameMs - vblankMs), enterVblankEvent, 0);
 	isVblank = 0;
+	frameStartTicks = 0;
 	vCount = 0;
 	hCountBase = 0;
 	curFrameTime = 0.0;

Core/HLE/sceKernelThread.cpp

@@ -240,6 +240,7 @@ public:
 			delete it->second;
 		}
 		calls_.clear();
+		types_.clear();
 		idGen_ = 0;
 	}
 

Core/HW/SasAudio.h

@@ -91,7 +91,9 @@ enum VoiceType {
 // It compresses 28 16-bit samples into a block of 16 bytes.
 class VagDecoder {
 public:
-	VagDecoder() : data_(0), read_(0), end_(true) {}
+	VagDecoder() : data_(0), read_(0), end_(true) {
+		memset(samples, 0, sizeof(samples));
+	}
 	void Start(u32 dataPtr, u32 vagSize, bool loopEnabled);
 
 	void GetSamples(s16 *outSamples, int numSamples);
@@ -202,6 +204,8 @@ struct SasVoice {
 			vagSize(0),
 			pcmAddr(0),
 			pcmSize(0),
+			pcmIndex(0),
+			pcmLoopPos(0),
 			sampleRate(44100),
 			sampleFrac(0),
 			pitch(PSP_SAS_PITCH_BASE),