X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cap_avi.c;h=fff2f7a5dcad3049029a57f81587fb53aa01f562;hb=a57baa2e50392b2f2d30623101af36deb0486a19;hp=e1c0e9396c4f4c82e8763173cf0376117c34d189;hpb=30765cee4b9bb4f0e189023788088d48a9bed7a0;p=xonotic%2Fdarkplaces.git

diff --git a/cap_avi.c b/cap_avi.c
index e1c0e939..fff2f7a5 100644
--- a/cap_avi.c
+++ b/cap_avi.c
@@ -188,7 +188,7 @@ static void SCR_CaptureVideo_RIFF_IndexEntry(const char *chunkfourcc, int chunks
 {
 	LOAD_FORMATSPECIFIC_AVI();
 	if(!format->canseek)
-		Host_Error("SCR_CaptureVideo_RIFF_IndexEntry called on non-seekable AVI");
+		Sys_Error("SCR_CaptureVideo_RIFF_IndexEntry called on non-seekable AVI");
 
 	if (format->riffstacklevel != 2)
 		Sys_Error("SCR_Capturevideo_RIFF_IndexEntry: RIFF stack level is %i (should be 2)\n", format->riffstacklevel);
@@ -209,7 +209,7 @@ static void SCR_CaptureVideo_RIFF_MakeIxChunk(const char *fcc, const char *dwChu
 	fs_offset_t pos, sz;
 	
 	if(!format->canseek)
-		Host_Error("SCR_CaptureVideo_RIFF_MakeIxChunk called on non-seekable AVI");
+		Sys_Error("SCR_CaptureVideo_RIFF_MakeIxChunk called on non-seekable AVI");
 
 	if(*masteridx_count >= AVI_MASTER_INDEX_SIZE)
 		return;
@@ -404,7 +404,7 @@ static void SCR_CaptureVideo_Avi_VideoFrames(int num)
 	}
 }
 
-void SCR_CaptureVideo_Avi_EndVideo(void)
+static void SCR_CaptureVideo_Avi_EndVideo(void)
 {
 	LOAD_FORMATSPECIFIC_AVI();
 
@@ -449,7 +449,7 @@ void SCR_CaptureVideo_Avi_EndVideo(void)
 	Mem_Free(format);
 }
 
-void SCR_CaptureVideo_Avi_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length)
+static void SCR_CaptureVideo_Avi_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length)
 {
 	LOAD_FORMATSPECIFIC_AVI();
 	int x;
@@ -462,18 +462,18 @@ void SCR_CaptureVideo_Avi_SoundFrame(const portable_sampleframe_t *paintbuffer,
 	{
 		int n0, n1;
 
-		n0 = paintbuffer[i].sample[0];
+		n0 = paintbuffer[i].sample[0] * 32768.0f;
 		n0 = bound(-32768, n0, 32767);
 		out_ptr[0] = (unsigned char)n0;
 		out_ptr[1] = (unsigned char)(n0 >> 8);
 
-		n1 = paintbuffer[i].sample[1];
+		n1 = paintbuffer[i].sample[1] * 32768.0f;
 		n1 = bound(-32768, n1, 32767);
 		out_ptr[2] = (unsigned char)n1;
 		out_ptr[3] = (unsigned char)(n1 >> 8);
 	}
 
-	x = length*4;
+	x = (int)length*4;
 	if(format->canseek)
 	{
 		SCR_CaptureVideo_RIFF_OverflowCheck(8 + x);
@@ -502,12 +502,13 @@ void SCR_CaptureVideo_Avi_BeginVideo(void)
 	int n, d;
 	unsigned int i;
 	double aspect;
+	char vabuf[1024];
 
 	aspect = vid.width / (vid.height * vid_pixelheight.value);
 
 	cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420;
 	cls.capturevideo.formatextension = "avi";
-	cls.capturevideo.videofile = FS_OpenRealFile(va("%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
+	cls.capturevideo.videofile = FS_OpenRealFile(va(vabuf, sizeof(vabuf), "%s.%s", cls.capturevideo.basename, cls.capturevideo.formatextension), "wb", false);
 	cls.capturevideo.endvideo = SCR_CaptureVideo_Avi_EndVideo;
 	cls.capturevideo.videoframes = SCR_CaptureVideo_Avi_VideoFrames;
 	cls.capturevideo.soundframe = SCR_CaptureVideo_Avi_SoundFrame;