Mercurial > mplayer.hg
changeset 9754:9a88e80e6314
Fix test compilation
| author | albeu |
|---|---|
| date | Sun, 30 Mar 2003 17:14:41 +0000 |
| parents | cd3b8691e930 |
| children | 6b7710f78c32 |
| files | libmpdemux/Makefile libmpdemux/test.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/Makefile Sun Mar 30 17:14:02 2003 +0000 +++ b/libmpdemux/Makefile Sun Mar 30 17:14:41 2003 +0000 @@ -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 *~
--- a/libmpdemux/test.c Sun Mar 30 17:14:02 2003 +0000 +++ b/libmpdemux/test.c Sun Mar 30 17:14:41 2003 +0000 @@ -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; }