diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 04:34:58 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-29 05:03:57 +0300 |
commit | 06a35804f37754e2d6ec5bdebe9d83fcddb1caf6 (patch) | |
tree | eb14069a6843691395ed20773c8768e91a5c1153 | |
parent | e1ef11f0f62cac4a848a4cc9bba2f06dee8fd362 (diff) | |
parent | 7398abf3899f953eda95d925df6bcc64b08461ed (diff) | |
download | mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.bz2 mpv-06a35804f37754e2d6ec5bdebe9d83fcddb1caf6.tar.xz |
Merge svn changes up to r26587
Conflicts:
Makefile
configure
osdep/timer-darwin.c
-rw-r--r-- | Makefile | 84 | ||||
-rw-r--r-- | common.mak | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | input/input.c | 2 | ||||
-rw-r--r-- | liba52/resample.c | 2 | ||||
-rw-r--r-- | liba52/test.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_qtaudio.c | 2 | ||||
-rw-r--r-- | libmpcodecs/native/nuppelvideo.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_qtvideo.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_xanim.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.c | 2 | ||||
-rw-r--r-- | loader/Makefile | 55 | ||||
-rw-r--r-- | loader/dmo/DMO_AudioDecoder.c | 2 | ||||
-rw-r--r-- | loader/dmo/DMO_VideoDecoder.c | 4 | ||||
-rw-r--r-- | loader/dshow/DS_AudioDecoder.c | 2 | ||||
-rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 4 | ||||
-rw-r--r-- | loader/dshow/test.c | 71 | ||||
-rw-r--r-- | loader/dshow/test.divx | bin | 9294 -> 0 bytes | |||
-rw-r--r-- | loader/qtx/list.c | 6 | ||||
-rw-r--r-- | loader/qtx/qtxload.c | 9 | ||||
-rw-r--r-- | mpcommon.mak | 30 | ||||
-rw-r--r-- | osdep/timer-darwin.c | 6 | ||||
-rw-r--r-- | stream/realrtsp/real.c | 2 |
23 files changed, 88 insertions, 207 deletions
@@ -406,6 +406,7 @@ SRCS_COMMON-$(PNG) += libmpcodecs/vd_mpng.c SRCS_COMMON-$(PVR) += stream/stream_pvr.c SRCS_COMMON-$(QTX_CODECS) += libmpcodecs/ad_qtaudio.c \ libmpcodecs/vd_qtvideo.c +SRCS_COMMON-$(QTX_EMULATION) += loader/wrapper.S SRCS_COMMON-$(RADIO) += stream/stream_radio.c SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ @@ -441,6 +442,16 @@ SRCS_COMMON-$(TV_V4L2) += stream/tvi_v4l2.c stream/audio_in.c SRCS_COMMON-$(UNRAR_EXEC) += unrar_exec.c SRCS_COMMON-$(VCD) += stream/stream_vcd.c SRCS_COMMON-$(VSTREAM) += stream/stream_vstream.c +SRCS_COMMON-$(WIN32_EMULATION) += loader/elfdll.c \ + loader/ext.c \ + loader/ldt_keeper.c \ + loader/module.c \ + loader/pe_image.c \ + loader/pe_resource.c \ + loader/registry.c \ + loader/resource.c \ + loader/win32.c \ + SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/ad_dmo.c \ libmpcodecs/ad_dshow.c \ @@ -450,6 +461,23 @@ SRCS_COMMON-$(WIN32DLL) += libmpcodecs/ad_acm.c \ libmpcodecs/vd_vfw.c \ libmpcodecs/vd_vfwex.c \ libmpdemux/demux_avs.c \ + loader/afl.c \ + loader/driver.c \ + loader/vfl.c \ + loader/dshow/DS_AudioDecoder.c \ + loader/dshow/DS_Filter.c \ + loader/dshow/DS_VideoDecoder.c \ + loader/dshow/allocator.c \ + loader/dshow/cmediasample.c \ + loader/dshow/guids.c \ + loader/dshow/inputpin.c \ + loader/dshow/mediatype.c \ + loader/dshow/outputpin.c \ + loader/dmo/DMO_AudioDecoder.c \ + loader/dmo/DMO_VideoDecoder.c \ + loader/dmo/buffer.c \ + loader/dmo/dmo.c \ + loader/dmo/dmo_guids.c \ SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c @@ -592,18 +620,16 @@ COMMON_LIBS-$(LIBAVFORMAT_A) += ffmpeg/libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += ffmpeg/libavcodec/libavcodec.a COMMON_LIBS-$(LIBAVUTIL_A) += ffmpeg/libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += ffmpeg/libpostproc/libpostproc.a -COMMON_LIBS-$(WIN32DLL) += loader/loader.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) COMMON_LIBS += $(COMMON_LIBS-yes) -LIBS_MPLAYER += $(LIBS_MPLAYER-yes) OBJS_MPLAYER += $(OBJS_MPLAYER-yes) ALL_PRG += $(ALL_PRG-yes) -MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(LIBS_MPLAYER) $(COMMON_LIBS) -MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(LIBS_MENCODER) $(COMMON_LIBS) +MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) +MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man @@ -616,11 +642,8 @@ PARTS = ffmpeg/libavcodec \ ffmpeg/libpostproc \ libswscale \ -ifeq ($(WIN32DLL),yes) -PARTS += loader -endif - -DIRS = dvdread \ +DIRS = . \ + dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -640,6 +663,9 @@ DIRS = dvdread \ libmpdemux \ libmpeg2 \ libvo \ + loader \ + loader/dshow \ + loader/dmo \ mp3lib \ osdep \ stream \ @@ -650,22 +676,17 @@ DIRS = dvdread \ TOOLS \ vidix \ -all: recurse $(ALL_PRG) +all: $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done -# Hack to keep .depend from being generated at the top level unnecessarily. -DEPS = foo - include mpcommon.mak -DEPS = $(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))) +DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) $(DEPS) recurse: help_mp.h version.h codecs.conf.h dep depend: $(DEPS) - for part in $(PARTS); do $(MAKE) -C $$part .depend; done - -CFLAGS := $(subst -I..,-I.,$(CFLAGS)) + for part in $(PARTS); do $(MAKE) -C $$part depend; done define RECURSIVE_RULE $(part)/$(part).a: @@ -674,6 +695,8 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) +$(OBJS): recurse + mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) @@ -706,6 +729,10 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Iffmpeg/libavcodec +loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) +#loader/%.o loader/%.d: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT +loader/win32.o loader/win32.d: CFLAGS += $(CFLAG_STACKREALIGN) + mp3lib/decode_i586.o: CFLAGS += -fomit-frame-pointer VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ @@ -714,10 +741,19 @@ VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ $(VIDIX_PCI_FILES): vidix/pci.db LC_ALL=C awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) -vidix/%.o vidix/%.d: $(VIDIX_PCI_FILES) +VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) +VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) + +$(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI_FILES) liba52/test: liba52/test.c cpudetect.o $(filter liba52/%,$(SRCS_COMMON:.c=.o)) +LOADER_TEST_OBJS = $(filter loader/%,$(SRCS_COMMON:.c=.o)) libmpdemux/aviprint.o cpudetect.o mp_msg.o mp_fifo.o osdep/mmap_anon.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm + +loader/qtx/list loader/qtx/qtxload: CFLAGS += -g +loader/qtx/list: loader/qtx/list.c $(LOADER_TEST_OBJS) +loader/qtx/qtxload: loader/qtx/qtxload.c $(LOADER_TEST_OBJS) + mp3lib/test: mp3lib/test.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm mp3lib/test2: mp3lib/test2.c $(filter mp3lib/%,$(SRCS_COMMON:.c=.o)) libvo/aclib.o cpudetect.o mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) -ltermcap -lm @@ -777,17 +813,17 @@ uninstall: fi ; \ done -clean:: toolsclean - -rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ - codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ - codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) +clean: toolsclean for part in $(PARTS); do $(MAKE) -C $$part clean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir)))) + rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \ + codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \ + codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES) -distclean:: doxygen_clean +distclean: clean doxygen_clean for part in $(PARTS); do $(MAKE) -C $$part distclean; done - -rm -f configure.log config.mak config.h rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) + rm -f configure.log config.mak config.h strip: strip -s $(ALL_PRG) diff --git a/common.mak b/common.mak index c33202f311..1d47b4a9bf 100644 --- a/common.mak +++ b/common.mak @@ -12,7 +12,7 @@ vpath %.S $(SRC_DIR) ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale CFLAGS = -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ - -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ + -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/ffmpeg\ $(addprefix -I$(SRC_PATH)/ffmpeg/lib,$(ALLFFLIBS)) $(OPTFLAGS) %.o: %.c @@ -7635,7 +7635,7 @@ if test "$cc_vendor" = "gnu" ; then fi CFLAGS_FFMPEG="-I../.. $CFLAGS" -CFLAGS="-I. -I../ffmpeg -I.. -I../ffmpeg/libavutil $CFLAGS" +CFLAGS="-I. -Iffmpeg -Iffmpeg/libavutil $CFLAGS" CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS" cc_check -mno-omit-leaf-frame-pointer && CFLAG_NO_OMIT_LEAF_FRAME_POINTER="-mno-omit-leaf-frame-pointer" diff --git a/input/input.c b/input/input.c index ac1a9d2b30..74312bbb7f 100644 --- a/input/input.c +++ b/input/input.c @@ -20,7 +20,7 @@ #include "osdep/getch2.h" #include "osdep/keycodes.h" #include "osdep/timer.h" -#include "avstring.h" +#include "libavutil/avstring.h" #include "mp_msg.h" #include "help_mp.h" #include "m_config.h" diff --git a/liba52/resample.c b/liba52/resample.c index 97eb928e97..cd87f2050c 100644 --- a/liba52/resample.c +++ b/liba52/resample.c @@ -31,7 +31,7 @@ #include <stdio.h> #include "a52.h" #include "mm_accel.h" -#include "../config.h" +#include "config.h" #include "mangle.h" int (* a52_resample) (float * _f, int16_t * s16)=NULL; diff --git a/liba52/test.c b/liba52/test.c index cbc58be394..57f0596af5 100644 --- a/liba52/test.c +++ b/liba52/test.c @@ -30,7 +30,7 @@ #include "a52.h" #include "mm_accel.h" -#include "../cpudetect.h" +#include "cpudetect.h" static a52_state_t *state; static uint8_t buf[3840]; diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index fff29094fb..4a9bf313e2 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -14,7 +14,7 @@ #include "loader/wine/windef.h" #include "ad_internal.h" -#include "bswap.h" +#include "mpbswap.h" #ifdef WIN32_LOADER #include "loader/ldt_keeper.h" diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index 8f4426340b..ff3e1f83fa 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -15,7 +15,7 @@ #include "mp_msg.h" #include "mpbswap.h" -#include "../libvo/fastmemcpy.h" +#include "libvo/fastmemcpy.h" #include "libmpdemux/nuppelvideo.h" #include "rtjpegn.h" diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c index c82b97338a..a690257875 100644 --- a/libmpcodecs/vd_qtvideo.c +++ b/libmpcodecs/vd_qtvideo.c @@ -28,7 +28,7 @@ static const vd_info_t info = { LIBVD_EXTERN(qtvideo) -#include "bswap.h" +#include "mpbswap.h" #ifndef HAVE_QUICKTIME #include "loader/qtx/qtxsdk/components.h" diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 07acf558be..5d1e4ec739 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -37,7 +37,7 @@ LIBVD_EXTERN(xanim) #include <errno.h> /* strerror, errno */ #include "mp_msg.h" -#include "bswap.h" +#include "mpbswap.h" #include "osdep/timer.h" diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c index 9754370239..10c28ab79b 100644 --- a/libmpcodecs/vf_scale.c +++ b/libmpcodecs/vf_scale.c @@ -12,7 +12,7 @@ #include "mp_image.h" #include "vf.h" #include "fmt-conversion.h" -#include "bswap.h" +#include "mpbswap.h" #include "libswscale/swscale.h" #include "vf_scale.h" diff --git a/loader/Makefile b/loader/Makefile deleted file mode 100644 index 3765c8c6ad..0000000000 --- a/loader/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = loader.a - -#CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT - -SRCS_COMMON = driver.c afl.c vfl.c -SRCS_COMMON-$(QTX_EMULATION) += wrapper.S -SRCS_COMMON-$(WIN32_EMULATION) += elfdll.c \ - ext.c \ - ldt_keeper.c \ - module.c \ - pe_image.c \ - pe_resource.c \ - registry.c \ - resource.c \ - win32.c \ - -SRCS_COMMON += dshow/DS_AudioDecoder.c \ - dshow/DS_Filter.c \ - dshow/DS_VideoDecoder.c \ - dshow/allocator.c \ - dshow/mediatype.c \ - dshow/cmediasample.c \ - dshow/guids.c \ - dshow/inputpin.c \ - dshow/outputpin.c \ - dmo/DMO_AudioDecoder.c \ - dmo/DMO_VideoDecoder.c \ - dmo/buffer.c \ - dmo/dmo.c \ - dmo/dmo_guids.c \ - -include ../mpcommon.mak - -CFLAGS+=-fno-omit-frame-pointer $(CFLAG_NO_OMIT_LEAF_FRAME_POINTER) -win32.o: CFLAGS += $(CFLAG_STACKREALIGN) - -TEST_OBJS = $(LIBNAME_COMMON) ../cpudetect.o ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -TEST_LDFLAGS = -ltermcap -ldl -lm -lpthread -g - -dshow/test: dshow/test.c ../get_path.o $(TEST_OBJS) - $(CC) $(CFLAGS) -o $@ $^ $(TEST_LDFLAGS) -lstdc++ - -qtx/qtxload: qtx/qtxload.c $(TEST_OBJS) - $(CC) -o $@ $^ $(TEST_LDFLAGS) - -qtx/list: qtx/list.c $(TEST_OBJS) - $(CC) -o $@ $^ $(TEST_LDFLAGS) - -clean:: - rm -f dshow/*.o dshow/*.a dshow/*~ - rm -f dmo/*.o dmo/*.a dmo/*~ - rm -f dshow/test dshow/test.raw - rm -f qtx/list qtx/qtxload diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c index 398cd86f51..0b83d48f4c 100644 --- a/loader/dmo/DMO_AudioDecoder.c +++ b/loader/dmo/DMO_AudioDecoder.c @@ -28,7 +28,7 @@ struct DMO_AudioDecoder #include <stdio.h> #include <stdlib.h> -#include "../../mp_msg.h" +#include "mp_msg.h" typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**); extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index c018506d75..9f3e9d7eb8 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -9,7 +9,7 @@ #include "dshow/interfaces.h" #include "registry.h" #ifdef WIN32_LOADER -#include "../ldt_keeper.h" +#include "ldt_keeper.h" #endif #include "dshow/libwin32.h" @@ -33,7 +33,7 @@ struct DMO_VideoDecoder //#include "DMO_VideoDecoder.h" -#include "../wine/winerror.h" +#include "wine/winerror.h" #include <unistd.h> #include <fcntl.h> diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index 73e7abcecb..2ac48cd25e 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -21,7 +21,7 @@ struct DS_AudioDecoder #include "DS_AudioDecoder.h" #ifdef WIN32_LOADER -#include "../ldt_keeper.h" +#include "ldt_keeper.h" #endif #include <string.h> diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index 415e7a3fb5..a10436e325 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -30,9 +30,9 @@ static SampleProcUserData sampleProcData; #include "DS_VideoDecoder.h" -#include "../wine/winerror.h" +#include "wine/winerror.h" #ifdef WIN32_LOADER -#include "../ldt_keeper.h" +#include "ldt_keeper.h" #endif #include <unistd.h> diff --git a/loader/dshow/test.c b/loader/dshow/test.c deleted file mode 100644 index 1b9818886e..0000000000 --- a/loader/dshow/test.c +++ /dev/null @@ -1,71 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "wine/mmreg.h" -#include "wine/vfw.h" - -#include "formats.h" -#include "com.h" - -#include "DS_VideoDec.h" - -int main(int argc,char* argv[]){ - FILE *f; - BITMAPINFOHEADER bih; - int len; - char *src; - char *dst=0; - GUID CLSID_DivxDecompressorCF={0x82CCd3E0, 0xF71A, 0x11D0, - { 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}}; - - f=fopen("test.divx","rb"); - - fread(&bih,sizeof(BITMAPINFOHEADER),1,f); - printf("frame dim: %d x %d \n",(int)bih.biWidth,(int)bih.biHeight); - - src=malloc(512000); - len=fread(src,1,512000,f); - printf("frame len = %d\n",len); - - DS_VideoDecoder_Open("divx_c32.ax", &CLSID_DivxDecompressorCF, &bih, 0, &dst); - -// DS_VideoDecoder_SetDestFmt(16,fccYUY2); - DS_VideoDecoder_SetDestFmt(24,0); - - printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",4) ); - - DS_VideoDecoder_Start(); - - printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) ); - - DS_VideoDecoder_DecodeFrame(src, len, 1, 1); - -#if 0 - f2=fopen("test.yuy2","wb"); - fwrite(dst,bih.biWidth*bih.biHeight*2,1,f2); - fclose(f2); -#endif - - { unsigned char raw_head[32]; - FILE *f=fopen("test.raw","wb"); - - strcpy((char*)raw_head,"mhwanh"); - raw_head[7]=4; - raw_head[8]=bih.biWidth>>8; - raw_head[9]=bih.biWidth&0xFF; - raw_head[10]=bih.biHeight>>8; - raw_head[11]=bih.biHeight&0xFF; - raw_head[12]=raw_head[13]=0; // 24bit - raw_head[14]=1;raw_head[15]=0x2C; - raw_head[16]=1;raw_head[17]=0x2C; - memset(raw_head+18,0,32-18); - fwrite(raw_head,32,1,f); - - fwrite(dst,bih.biWidth*bih.biHeight*3,1,f); - fclose(f); - } - - -return 0; -} diff --git a/loader/dshow/test.divx b/loader/dshow/test.divx Binary files differdeleted file mode 100644 index 397f72989a..0000000000 --- a/loader/dshow/test.divx +++ /dev/null diff --git a/loader/qtx/list.c b/loader/qtx/list.c index 5c782fc05a..34e93dccc5 100644 --- a/loader/qtx/list.c +++ b/loader/qtx/list.c @@ -8,6 +8,7 @@ #include "qtxsdk/components.h" #include "qtxsdk/select.h" +#include "ldt_keeper.h" char* get_path(const char* x){ return strdup(x);} void* LoadLibraryA(char* name); @@ -51,8 +52,7 @@ int main(int argc, char *argv[]){ desc.componentFlags=0; desc.componentFlagsMask=0; - printf("Count = %d\n",CountComponents(&desc)); - - Restore_LDT_Keeper(); + printf("Count = %ld\n",CountComponents(&desc)); + exit(0); } diff --git a/loader/qtx/qtxload.c b/loader/qtx/qtxload.c index d17c3138d9..88dc032d33 100644 --- a/loader/qtx/qtxload.c +++ b/loader/qtx/qtxload.c @@ -4,6 +4,8 @@ #include "qtxsdk/components.h" #include "qtxsdk/select.h" +#include "ldt_keeper.h" +#include "mp_msg.h" /* ilyen egy sima komponens */ ComponentResult ComponentDummy( @@ -42,8 +44,8 @@ int main(int argc, char *argv[]){ ComponentParameters *params; ComponentDescription desc; void *globals=NULL; - unsigned int esp=0; - int i; + //unsigned int esp=0; + //int i; mp_msg_init(); //mp_msg_set_level(10); @@ -120,8 +122,7 @@ int main(int argc, char *argv[]){ // for(i=0;i<0x00001837;i++) // if(x_table[i]) printf("x_table[0x%X] = %p\n",i,x_table[i]); - - Restore_LDT_Keeper(); + exit(0); //return 0; } diff --git a/mpcommon.mak b/mpcommon.mak index 342a3351d9..c84732161d 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -10,28 +10,6 @@ OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) -LIBS-$(MPLAYER) += $(LIBNAME_MPLAYER) -LIBS-$(MENCODER) += $(LIBNAME_MENCODER) -LIBS = $(LIBNAME_COMMON) $(LIBS-yes) - -libs: $(LIBS) - -$(LIBNAME_COMMON): $(OBJS_COMMON) -$(LIBNAME_MPLAYER): $(OBJS_MPLAYER) -$(LIBNAME_MENCODER): $(OBJS_MENCODER) -$(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): - $(AR) r $@ $^ - $(RANLIB) $@ - -clean:: - rm -f *.o *.a *.ho *~ - -distclean:: clean - rm -f *.d .depend test test2 - -.depend: $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER) - $(MPDEPEND_CMD) > $@ - %.d: %.c $(MPDEPEND_CMD) > $@ @@ -50,10 +28,4 @@ distclean:: clean ALLHEADERS = $(wildcard *.h) checkheaders: $(ALLHEADERS:.h=.ho) -# Hack to keep .depend from being generated at the top level unnecessarily. -ifndef DEPS -DEPS = .depend -endif --include $(DEPS) - -.PHONY: libs *clean dep depend +.PHONY: checkheaders *clean dep depend diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index e087b33f12..64edfe7ef6 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -53,15 +53,13 @@ int usec_sleep(int usec_delay) /* current time in microseconds */ unsigned int GetTimer() { - return (unsigned int)((mach_absolute_time() * timebase_ratio) - * 1e6); + return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e6); } /* current time in milliseconds */ unsigned int GetTimerMS() { - return (unsigned int)((mach_absolute_time() * timebase_ratio) - * 1e3); + return (unsigned int)(uint64_t)(mach_absolute_time() * timebase_ratio * 1e3); } /* initialize timer, must be called at least once at start */ diff --git a/stream/realrtsp/real.c b/stream/realrtsp/real.c index f20c92e24e..62670f4726 100644 --- a/stream/realrtsp/real.c +++ b/stream/realrtsp/real.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> -#include "../config.h" +#include "config.h" #include "libavutil/common.h" #include "real.h" #include "asmrp.h" |