[Mplayer-cvslog] CVS: main/libmpdemux Makefile,1.53,1.54 test.c,1.10,1.11

[Alban Bedel CVS]

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

Modified Files:
	Makefile test.c 
Log Message:
Fix test compilation


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile	17 Mar 2003 11:37:28 -0000	1.53
+++ Makefile	30 Mar 2003 17:14:41 -0000	1.54
@@ -50,7 +50,7 @@
 	$(AR) r $(LIBNAME) $(OBJS)
 
 test:	$(LIBNAME) test.c
-	$(CC) $(CFLAGS) test.c ../mp_msg.c ../linux/shmem.c -o test ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
+	$(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test ./libmpdemux.a ../libmpdvdkit2/libmpdvdkit.a ../libvo/aclib.o ../libmpcodecs/img_format.o ../libao2/afmt.o ../sub_cc.o ../m_option.o ../subreader.o $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread
 
 clean:
 	rm -f *.o *.a *~

Index: test.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- test.c	23 Oct 2002 18:20:13 -0000	1.10
+++ test.c	30 Mar 2003 17:14:41 -0000	1.11
@@ -36,6 +36,11 @@
 int vo_osd_changed(int new_value){return 0;}
 int   subcc_enabled=0;
 
+float sub_fps=0;
+int sub_utf8=0;
+int   suboverlap_enabled = 1;
+float sub_delay=0;
+
 //---------------
 
 extern stream_t* open_stream(char* filename,int vcd_track,int* file_format);
@@ -64,7 +69,7 @@
   if(stream_cache_size)
       stream_enable_cache(stream,stream_cache_size,0,0);
 
-  demuxer=demux_open(stream,file_format,-1,-1,-1);
+  demuxer=demux_open(stream,file_format,-1,-1,-1,NULL);
   if(!demuxer){
 	printf("Cannot open demuxer\n");
 	exit(1);
@@ -73,4 +78,5 @@
   if(demuxer->video->sh)
       video_read_properties(demuxer->video->sh);
 
+  return 0;
 }