X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cl_video.c;h=4e37eb7548dc46ab6220bacb921991c93e34ff79;hb=6ad14022e79720dfd015045545f889837d18e92e;hp=aca8249e26494b7450c91f165bd9172966bb23f2;hpb=2dbe17fce49258350f4a501edc8923470f224cb5;p=xonotic%2Fdarkplaces.git

diff --git a/cl_video.c b/cl_video.c
index aca8249e..4e37eb75 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -5,9 +5,9 @@
 #include "dpvsimpledecode.h"
 
 // VorteX: JAM video module used by Blood Omnicide
-//#define USEJAM
+#define USEJAM
 #ifdef USEJAM
-  #include "jamdecode.c"
+  #include "cl_video_jamdecode.c"
 #endif
 
 // cvars
@@ -61,7 +61,7 @@ static qboolean OpenStream( clvideo_t * video )
 static void VideoUpdateCallback(rtexture_t *rt, void *data)
 {
 	clvideo_t *video = (clvideo_t *) data;
-	R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, video->cpif.width, video->cpif.height );
+	R_UpdateTexture( video->cpif.tex, (unsigned char *)video->imagedata, 0, 0, 0, video->cpif.width, video->cpif.height, 1 );
 }
 
 static void LinkVideoTexture( clvideo_t *video )
@@ -613,6 +613,9 @@ static void CL_PlayVideo_f(void)
 
 	Host_StartVideo();
 
+	if (COM_CheckParm("-benchmark"))
+		return;
+
 	if (Cmd_Argc() < 2)
 	{
 		Con_Print("usage: playvideo <videoname> [custom_subtitles_file]\nplays video named video/<videoname>.dpv\nif custom subtitles file is not presented\nit tries video/<videoname>.sub");