April 2008 - MPlayer-cvslog - lists.mplayerhq.hu

r26581 - in trunk: Makefile mpcommon.mak
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 17:42:36 2008 New Revision: 26581 Log: Remove code for .depend generation, inclusion and related hacks. Modified: trunk/Makefile trunk/mpcommon.mak Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 17:42:36 2008 @@ -678,9 +678,6 @@ 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 = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Mon Apr 28 17:42:36 2008 @@ -27,10 +27,7 @@ clean:: rm -f *.o *.a *.ho *~ distclean:: clean - rm -f *.d .depend test test2 - -.depend: $(SRCS_COMMON) $(SRCS_MPLAYER) $(SRCS_MENCODER) - $(MPDEPEND_CMD) > $@ + rm -f *.d test test2 %.d: %.c $(MPDEPEND_CMD) > $@ @@ -50,10 +47,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

1 0

r26580 - trunk/libswscale
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 17:41:30 2008 New Revision: 26580 Log: .depend should no longer be ignored. Modified: trunk/libswscale/ (props changed)

1 0

r26579 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 17:36:00 2008 New Revision: 26579 Log: Run 'make depend', not 'make .depend' in FFmpeg subdirectories. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 17:36:00 2008 @@ -686,7 +686,7 @@ include mpcommon.mak 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 + for part in $(PARTS); do $(MAKE) -C $$part depend; done define RECURSIVE_RULE $(part)/$(part).a:

1 0

r26578 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 17:20:15 2008 New Revision: 26578 Log: Remove unnecessary CFLAGS hack. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 17:20:15 2008 @@ -688,8 +688,6 @@ $(DEPS) recurse: help_mp.h version.h cod dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part .depend; done -CFLAGS := $(subst -I..,-I.,$(CFLAGS)) - define RECURSIVE_RULE $(part)/$(part).a: $(MAKE) -C $(part)

1 0

r26577 - trunk/configure
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 17:19:50 2008 New Revision: 26577 Log: Remove unnecessary -I.. from CFLAGS, change -I../libavutil to -Ilibavutil. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Apr 28 17:19:50 2008 @@ -7626,7 +7626,7 @@ if test "$_dvdread_internal" = yes || te CFLAGS="$CFLAGS -DHAVE_CONFIG_H" fi -CFLAGS="-I. -I.. -I../libavutil $CFLAGS" +CFLAGS="-I. -Ilibavutil $CFLAGS" CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS" cat > $TMPC << EOF

1 0

r26576 - in trunk: dvdread/bswap.h liba52/resample.c liba52/test.c libmpcodecs/native/nuppelvideo.c loader/dmo/DMO_AudioDecoder.c loader/dmo/DMO_VideoDecoder.c loader/dshow/DS_AudioDecoder.c loader/dshow/DS_VideoDecoder.c stream/realrtsp/real.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 16:50:24 2008 New Revision: 26576 Log: Use consistent #include paths without "../". Modified: trunk/dvdread/bswap.h trunk/liba52/resample.c trunk/liba52/test.c trunk/libmpcodecs/native/nuppelvideo.c trunk/loader/dmo/DMO_AudioDecoder.c trunk/loader/dmo/DMO_VideoDecoder.c trunk/loader/dshow/DS_AudioDecoder.c trunk/loader/dshow/DS_VideoDecoder.c trunk/stream/realrtsp/real.c Modified: trunk/dvdread/bswap.h ============================================================================== --- trunk/dvdread/bswap.h (original) +++ trunk/dvdread/bswap.h Mon Apr 28 16:50:24 2008 @@ -1,7 +1,7 @@ #ifndef DVDREAD_BSWAP_H #define DVDREAD_BSWAP_H -#include "../libavutil/bswap.h" +#include "libavutil/bswap.h" #ifdef WORDS_BIGENDIAN #define B2N_16(x) Modified: trunk/liba52/resample.c ============================================================================== --- trunk/liba52/resample.c (original) +++ trunk/liba52/resample.c Mon Apr 28 16:50:24 2008 @@ -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; Modified: trunk/liba52/test.c ============================================================================== --- trunk/liba52/test.c (original) +++ trunk/liba52/test.c Mon Apr 28 16:50:24 2008 @@ -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]; Modified: trunk/libmpcodecs/native/nuppelvideo.c ============================================================================== --- trunk/libmpcodecs/native/nuppelvideo.c (original) +++ trunk/libmpcodecs/native/nuppelvideo.c Mon Apr 28 16:50:24 2008 @@ -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" Modified: trunk/loader/dmo/DMO_AudioDecoder.c ============================================================================== --- trunk/loader/dmo/DMO_AudioDecoder.c (original) +++ trunk/loader/dmo/DMO_AudioDecoder.c Mon Apr 28 16:50:24 2008 @@ -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); Modified: trunk/loader/dmo/DMO_VideoDecoder.c ============================================================================== --- trunk/loader/dmo/DMO_VideoDecoder.c (original) +++ trunk/loader/dmo/DMO_VideoDecoder.c Mon Apr 28 16:50:24 2008 @@ -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> Modified: trunk/loader/dshow/DS_AudioDecoder.c ============================================================================== --- trunk/loader/dshow/DS_AudioDecoder.c (original) +++ trunk/loader/dshow/DS_AudioDecoder.c Mon Apr 28 16:50:24 2008 @@ -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> Modified: trunk/loader/dshow/DS_VideoDecoder.c ============================================================================== --- trunk/loader/dshow/DS_VideoDecoder.c (original) +++ trunk/loader/dshow/DS_VideoDecoder.c Mon Apr 28 16:50:24 2008 @@ -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> Modified: trunk/stream/realrtsp/real.c ============================================================================== --- trunk/stream/realrtsp/real.c (original) +++ trunk/stream/realrtsp/real.c Mon Apr 28 16:50:24 2008 @@ -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"

1 0

r26575 - trunk/input/input.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 16:44:10 2008 New Revision: 26575 Log: Use full path for libavutil #includes. Modified: trunk/input/input.c Modified: trunk/input/input.c ============================================================================== --- trunk/input/input.c (original) +++ trunk/input/input.c Mon Apr 28 16:44:10 2008 @@ -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"

1 0

r26574 - in trunk/libmpcodecs: ad_qtaudio.c vd_qtvideo.c vd_xanim.c vf_scale.c
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 16:43:30 2008 New Revision: 26574 Log: Consistently #include mpbswap.h instead of bswap.h everywhere. Modified: trunk/libmpcodecs/ad_qtaudio.c trunk/libmpcodecs/vd_qtvideo.c trunk/libmpcodecs/vd_xanim.c trunk/libmpcodecs/vf_scale.c Modified: trunk/libmpcodecs/ad_qtaudio.c ============================================================================== --- trunk/libmpcodecs/ad_qtaudio.c (original) +++ trunk/libmpcodecs/ad_qtaudio.c Mon Apr 28 16:43:30 2008 @@ -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" Modified: trunk/libmpcodecs/vd_qtvideo.c ============================================================================== --- trunk/libmpcodecs/vd_qtvideo.c (original) +++ trunk/libmpcodecs/vd_qtvideo.c Mon Apr 28 16:43:30 2008 @@ -28,7 +28,7 @@ static vd_info_t info = { LIBVD_EXTERN(qtvideo) -#include "bswap.h" +#include "mpbswap.h" #ifndef HAVE_QUICKTIME #include "loader/qtx/qtxsdk/components.h" Modified: trunk/libmpcodecs/vd_xanim.c ============================================================================== --- trunk/libmpcodecs/vd_xanim.c (original) +++ trunk/libmpcodecs/vd_xanim.c Mon Apr 28 16:43:30 2008 @@ -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" Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c (original) +++ trunk/libmpcodecs/vf_scale.c Mon Apr 28 16:43:30 2008 @@ -11,7 +11,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"

1 0

r26573 - in trunk: Makefile loader loader/Makefile loader/dmo loader/dshow
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 16:01:58 2008 New Revision: 26573 Log: Merge loader/Makefile into top-level Makefile. Removed: trunk/loader/Makefile Modified: trunk/Makefile trunk/loader/ (props changed) trunk/loader/dmo/ (props changed) trunk/loader/dshow/ (props changed) Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 16:01:58 2008 @@ -404,6 +404,7 @@ SRCS_COMMON-$(PNG) += 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 \ @@ -439,6 +440,16 @@ SRCS_COMMON-$(TV_V4L2) += 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 \ @@ -448,6 +459,23 @@ SRCS_COMMON-$(WIN32DLL) += 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 @@ -589,7 +617,6 @@ COMMON_LIBS-$(LIBAVFORMAT_A) += lib COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a -COMMON_LIBS-$(WIN32DLL) += loader/loader.a ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) ALL_PRG-$(MENCODER) += mencoder$(EXESUF) @@ -613,10 +640,6 @@ PARTS = libavcodec \ libpostproc \ libswscale \ -ifeq ($(WIN32DLL),yes) -PARTS += loader -endif - DIRS = dvdread \ gui \ gui/mplayer \ @@ -637,6 +660,9 @@ DIRS = dvdread \ libmpdemux \ libmpeg2 \ libvo \ + loader \ + loader/dshow \ + loader/dmo \ mp3lib \ osdep \ stream \ @@ -705,6 +731,10 @@ libfaad2/%.o libfaad2/%.d: CFLAGS += -Il libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec +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 \ @@ -720,6 +750,12 @@ $(VIDIX_DEPS) $(VIDIX_OBJS): $(VIDIX_PCI 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

1 0

r26572 - trunk/Makefile
by diego 28 Apr '08

28 Apr '08

Author: diego Date: Mon Apr 28 15:31:00 2008 New Revision: 26572 Log: Restore line mistakenly commented out in the last commit. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 15:31:00 2008 @@ -903,6 +903,6 @@ TOOLS/netstream$(EXESUF): TOOLS/netstrea toolsclean: rm -f $(ALLTOOLS) TOOLS/fastmem*-* TOOLS/realcodecs/*.so.6.0 -#-include $(DEPS) +-include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools

1 0