[Mplayer-cvslog] CVS: main/libmpdemux demux_nuv.c,1.1,1.2

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv18705

Modified Files:
	demux_nuv.c 
Log Message:
audio is working

Index: demux_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- demux_nuv.c	27 Dec 2001 21:24:56 -0000	1.1
+++ demux_nuv.c	27 Dec 2001 23:07:30 -0000	1.2
@@ -43,7 +43,9 @@
 	    return 0; /* EOF */
 
 #if 0
-	printf("NUV frame read: %c packetlength: %d orig: %d new: %d\n", rtjpeg_frameheader.frametype,rtjpeg_frameheader.packetlength, orig_pos, orig_pos+rtjpeg_frameheader.packetlength);
+	printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n",
+	    rtjpeg_frameheader.frametype, rtjpeg_frameheader.comptype,
+	    rtjpeg_frameheader.packetlength);
 #endif
 
 	/* Skip Seekpoint, Text and Sync for now */
@@ -117,14 +119,14 @@
 
 	sh_video->disp_w = rtjpeg_fileheader.width;
 	sh_video->disp_h = rtjpeg_fileheader.height;
-	
-	sh_video->aspect = rtjpeg_fileheader.aspect;
+
+	sh_video->aspect = (float)rtjpeg_fileheader.aspect;
 
 	/* Get the FPS */
 	sh_video->fps = rtjpeg_fileheader.fps;
 	sh_video->frametime = 1 / sh_video->fps;
 
-#if 0
+#if 1
 	if (rtjpeg_fileheader.audioblocks != 0)
 	{
 	    sh_audio = new_sh_audio(demuxer, 0);