Merge pull request #5212 from raven02/patch-1

Revert #5044 and set ctx->avc.avcDecodeResult = 1
hrydgard · Jan 25, 2014 · aed3ed2 · aed3ed2
2 parents 39bfc03 + 3236625
commit aed3ed2
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
@@ -265,7 +265,7 @@ void AnalyzeMpeg(u8 *buffer, MpegContext *ctx) {
 	ctx->mpegLastDate = convertTimestampToDate(ctx->mpegLastTimestamp);
 	ctx->avc.avcDetailFrameWidth = (*(u8*)(buffer + 142)) * 0x10;
 	ctx->avc.avcDetailFrameHeight = (*(u8*)(buffer + 143)) * 0x10;
-	ctx->avc.avcDecodeResult = 0;
+	ctx->avc.avcDecodeResult = MPEG_AVC_DECODE_SUCCESS;
 	ctx->avc.avcFrameStatus = 0;
 
 	ctx->videoFrameCount = 0;
@@ -1092,12 +1092,6 @@ int sceMpegGetAvcAu(u32 mpeg, u32 streamId, u32 auAddr, u32 attrAddr)
 		result = PSP_ERROR_MPEG_NO_DATA;
 	}
 
-	if (ctx->avc.avcDecodeResult == 0) {
-		INFO_LOG(ME, "Video decode completed");
-		ctx->avc.avcDecodeResult = MPEG_AVC_DECODE_SUCCESS;
-		result = PSP_ERROR_MPEG_NO_DATA;
-	}
-
 	// The avcau struct may have been modified by mediaengine, write it back.
 	sceAu.write(auAddr);