diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-30 17:14:41 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-30 17:14:41 +0000 |
| commit | 81a331b92449b505155e69570dfeb5f2f2dc3a46 (patch) | |
| tree | 2ee3b365f17b27aff54958f39397e74f650df059 /libmpdemux | |
| parent | 316a8920be0c084dd4890f58219ad76091dc8b02 (diff) | |
| download | mpv-81a331b92449b505155e69570dfeb5f2f2dc3a46.tar.bz2 mpv-81a331b92449b505155e69570dfeb5f2f2dc3a46.tar.xz | |
Fix test compilation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9755 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/test.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 08e05a001b..0e3e2e7401 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -50,7 +50,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 ../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 *~ diff --git a/libmpdemux/test.c b/libmpdemux/test.c index feb3e5e01e..9369b7e649 100644 --- a/libmpdemux/test.c +++ b/libmpdemux/test.c @@ -36,6 +36,11 @@ void* vo_sub=NULL; 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 @@ int file_format=DEMUXER_TYPE_UNKNOWN; 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 @@ int file_format=DEMUXER_TYPE_UNKNOWN; if(demuxer->video->sh) video_read_properties(demuxer->video->sh); + return 0; } |