summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmpdemux/Makefile2
-rw-r--r--libmpdemux/test.c8
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;
}