diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-23 18:20:13 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-23 18:20:13 +0000 |
| commit | 5fe1f32e2be8289432a9836360fae07e3b06bf4d (patch) | |
| tree | e914c6f3995d9f74d52b843123ab3af2b579c870 /libmpdemux | |
| parent | 1eb12974fff3c385c0e864eaf3a6fc3e69c9be0d (diff) | |
| download | mpv-5fe1f32e2be8289432a9836360fae07e3b06bf4d.tar.bz2 mpv-5fe1f32e2be8289432a9836360fae07e3b06bf4d.tar.xz | |
yeah, test.c works now!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7875 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/test.c | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 8bdc1290b8..055a82a74b 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -39,7 +39,7 @@ $(LIBNAME): $(OBJS) $(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 *~ diff --git a/libmpdemux/test.c b/libmpdemux/test.c index bee727e84a..feb3e5e01e 100644 --- a/libmpdemux/test.c +++ b/libmpdemux/test.c @@ -29,6 +29,13 @@ int mp_input_check_interrupt(int time){ 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 @@ int file_format=DEMUXER_TYPE_UNKNOWN; 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); } |