aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 20:32:38 +0000
committerGravatar ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 20:32:38 +0000
commit8f8547ae863e740f76fbe88064c28c1c4da1182b (patch)
treebb9522c6052aa6bc2a1160faa56570fadfc23b1d
parentc0821a7d5171f2845570a578b01f5160e7fb0459 (diff)
removed deprecated test.c file from libmpdemux
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19282 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/Makefile12
-rw-r--r--libmpdemux/test.c82
-rw-r--r--stream/Makefile4
3 files changed, 4 insertions, 94 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile
index 97c59aa0fc..edbbf22787 100644
--- a/libmpdemux/Makefile
+++ b/libmpdemux/Makefile
@@ -123,24 +123,16 @@ $(LIBNAME): $(OBJS)
$(AR) r $(LIBNAME) $(OBJS)
$(RANLIB) $(LIBNAME)
-test: $(LIBNAME) test.c
- $(CC) $(CFLAGS) test.c ../mp_msg.c ../osdep/shmem.c -o test \
- ./libmpdemux.a ../stream/stream.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 *~
distclean: clean
- rm -f .depend test
+ rm -f .depend
dep: depend
depend:
- $(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+ $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
#
# include dependency files if they exist
diff --git a/libmpdemux/test.c b/libmpdemux/test.c
deleted file mode 100644
index 7e7ebd9d65..0000000000
--- a/libmpdemux/test.c
+++ /dev/null
@@ -1,82 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "config.h"
-#include "mp_msg.h"
-
-#include "stream.h"
-#include "demuxer.h"
-#include "stheader.h"
-
-//--------------------------
-
-// audio stream skip/resync functions requires only for seeking.
-// (they should be implemented in the audio codec layer)
-void skip_audio_frame(sh_audio_t *sh_audio){
-}
-void resync_audio_stream(sh_audio_t *sh_audio){
-}
-
-int mp_input_check_interrupt(int time){
- if(time) usleep(time);
- return 0;
-}
-
-// for libmpdvdkit2:
-#include "get_path.c"
-
-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;
-
-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);
-
-int main(int argc,char* argv[]){
-
-stream_t* stream=NULL;
-demuxer_t* demuxer=NULL;
-int file_format=DEMUXER_TYPE_UNKNOWN;
-
- mp_msg_init(verbose+MSGL_STATUS);
-
- if(argc>1)
- stream=open_stream(argv[1],0,&file_format);
- else
-// stream=open_stream("/3d/divx/405divx_sm_v2[1].avi",0,&file_format);
- stream=open_stream("/dev/cdrom",2,&file_format); // VCD track 2
-
- if(!stream){
- printf("Cannot open file/device\n");
- exit(1);
- }
-
- printf("success: format: %d data: 0x%X - 0x%X\n",file_format, (int)(stream->start_pos),(int)(stream->end_pos));
-
- if(stream_cache_size)
- stream_enable_cache(stream,stream_cache_size,0,0);
-
- demuxer=demux_open(stream,file_format,-1,-1,-1,NULL);
- if(!demuxer){
- printf("Cannot open demuxer\n");
- exit(1);
- }
-
- if(demuxer->video->sh)
- video_read_properties(demuxer->video->sh);
-
- return 0;
-}
diff --git a/stream/Makefile b/stream/Makefile
index 85435fb73a..87b9fc4a5e 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -136,12 +136,12 @@ clean:
freesdp/*.o freesdp/*.a freesdp/*~
distclean: clean
- rm -f .depend test
+ rm -f .depend
dep: depend
depend:
- $(CC) -MM $(CFLAGS) test.c $(SRCS) 1>.depend
+ $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
#
# include dependency files if they exist