Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv12605 Modified Files: test.c Makefile Log Message: yeah, test.c works now! Index: test.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/test.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- test.c 23 Oct 2002 17:21:00 -0000 1.9 +++ test.c 23 Oct 2002 18:20:13 -0000 1.10 @@ -29,6 +29,13 @@ int verbose=5; // must be global! +int stream_cache_size=0; + +// for demux_ogg: +void* vo_sub=NULL; +int vo_osd_changed(int new_value){return 0;} +int subcc_enabled=0; + //--------------- extern stream_t* open_stream(char* filename,int vcd_track,int* file_format); @@ -54,13 +61,16 @@ printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos)); - stream_enable_cache(stream,2048*1024,0,0); + if(stream_cache_size) + stream_enable_cache(stream,stream_cache_size,0,0); demuxer=demux_open(stream,file_format,-1,-1,-1); if(!demuxer){ printf("Cannot open demuxer\n"); exit(1); } - + + if(demuxer->video->sh) + video_read_properties(demuxer->video->sh); } Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- Makefile 23 Oct 2002 17:23:05 -0000 1.41 +++ Makefile 23 Oct 2002 18:20:13 -0000 1.42 @@ -39,7 +39,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 $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread + $(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 clean: rm -f *.o *.a *~