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

r26600 - trunk/etc/codecs.conf
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 11:30:05 2008 New Revision: 26600 Log: Sync codec short name changes from FFmpeg. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Apr 30 11:30:05 2008 @@ -1752,7 +1752,7 @@ videocodec ffvmnc status working fourcc VMnc driver ffmpeg - dll "VMware video" + dll "vmnc" out BGR32,BGR15,BGR8 videocodec vmnc @@ -2520,7 +2520,7 @@ audiocodec ffatrc format 0x63727461 ; "atrc" format 0x270 ; atrac3 in wav driver ffmpeg - dll "atrac 3" + dll "atrac3" audiocodec ra144 info "RealAudio 1.0" @@ -3092,7 +3092,7 @@ audiocodec ffmusepack7 status working fourcc "MPC " driver ffmpeg - dll "mpc sv7" + dll "mpc7" audiocodec ffmusepack8 info "Musepack sv8 audio codec" @@ -3100,7 +3100,7 @@ audiocodec ffmusepack8 status working fourcc "MPC8" driver ffmpeg - dll "mpc sv8" + dll "mpc8" audiocodec musepack info "Musepack audio codec"

1 0

r26599 - in trunk: Makefile configure
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Wed Apr 30 00:27:50 2008 New Revision: 26599 Log: Move CFLAGS setting to configure. Modified: trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 00:27:50 2008 @@ -636,8 +636,6 @@ OBJS_COMMON += $(addsuffix .o, $(base OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) -CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) - INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Apr 30 00:27:50 2008 @@ -7696,6 +7696,7 @@ WINDRES = $_windres INSTALL = $_install EXTRA_INC = $_inc_extra EXTRAXX_INC = $_inc_extra $_inc_extraxx +CFLAGS = $CFLAGS \$(EXTRA_INC) OPTFLAGS = $CFLAGS \$(EXTRA_INC) CFLAG_NO_OMIT_LEAF_FRAME_POINTER = $CFLAG_NO_OMIT_LEAF_FRAME_POINTER CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC)

1 0

r26598 - trunk/DOCS/tech/MAINTAINERS
by compn 29 Apr '08

29 Apr '08

Author: compn Date: Tue Apr 29 19:54:54 2008 New Revision: 26598 Log: change cvs > svn Modified: trunk/DOCS/tech/MAINTAINERS Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS (original) +++ trunk/DOCS/tech/MAINTAINERS Tue Apr 29 19:54:54 2008 @@ -3,13 +3,13 @@ MPlayer code and documentation maintaine ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ NOTE: This file (should) contain the up-to-date list of the maintainers of -each part/module of the mplayer CVS / source tree, including docs & homepage. +each part/module of the mplayer svn / source tree, including docs & homepage. You should NOT commit non-trivial changes without the agreement by the maintainer of the given part. The job of the maintainer is commenting, refusing or accepting patches, suggestions. If you're listed here as maintainer of one or more parts, but you don't want it to be so, tell us and you will be removed... this list has been created -based on maillist/cvs activity. It may be wrong. +based on maillist/svn activity. It may be wrong. Always send the patches (first read DOCS/tech/patches.txt), comments to the mplayer-dev-eng mailing list!!!

1 0

r26597 - trunk/etc/codecs.conf
by compn 29 Apr '08

29 Apr '08

Author: compn Date: Tue Apr 29 19:45:41 2008 New Revision: 26597 Log: add info lines to ffmimic, ffkmvc. fixes codec-status table. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Tue Apr 29 19:45:41 2008 @@ -10,6 +10,7 @@ release 20070930 ;============================================================================= videocodec ffmimic + info "FFmpeg Mimic video" status working fourcc ML20 out I420 @@ -17,6 +18,7 @@ videocodec ffmimic dll "mimic" videocodec ffkmvc + info "FFmpeg Karl Morton Video Codec" status working fourcc KMVC out BGR8

1 0

r26596 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 11:19:03 2008 New Revision: 26596 Log: Link tools against mp_msg-mencoder.o instead of mp_msg.o. The latter may depend on the GUI and cause link failures. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 11:19:03 2008 @@ -924,7 +924,7 @@ ALLTOOLS = $(TOOLS) \ tools: $(TOOLS) alltools: $(ALLTOOLS) -TOOLS_COMMON_LIBS = mp_msg.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ +TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp_fifo.o osdep/$(TIMER) osdep/$(GETCH) \ -ltermcap -lm TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image

1 0

r26595 - in trunk: Makefile mpcommon.mak
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 10:53:08 2008 New Revision: 26595 Log: Merge mpcommon.mak into Makefile. Removed: trunk/mpcommon.mak Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 10:53:08 2008 @@ -628,6 +628,16 @@ ALL_PRG += $(ALL_PRG-yes) MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) +SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes) +SRCS_MENCODER += $(SRCS_MENCODER-yes) +SRCS_MPLAYER += $(SRCS_MPLAYER-yes) + +OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) ) +OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) ) +OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) ) + +CFLAGS += $(CFLAGS-yes) $(OPTFLAGS) + INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man INSTALL_TARGETS-$(GUI) += install-gui @@ -691,7 +701,20 @@ all: $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done -include mpcommon.mak +%.d: %.c + $(MPDEPEND_CMD) > $@ + +%.d: %.cpp + $(MPDEPEND_CMD_CXX) > $@ + +%.d: %.m + $(MPDEPEND_CMD) > $@ + +%.ho: %.h + $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< + +%.o: %.m + $(CC) $(CFLAGS) -c -o $@ $< 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 @@ -863,6 +886,9 @@ TAGS: tags: rm -f $@; ( find -name '*.[chS]' -print ) | xargs ctags -a +ALLHEADERS = $(wildcard *.h) +checkheaders: $(ALLHEADERS:.h=.ho) + # ./configure must be rerun if it changed config.mak: configure @echo "############################################################" @@ -947,3 +973,4 @@ toolsclean: -include $(DEPS) .PHONY: all doxygen *install* recurse strip *tools +.PHONY: checkheaders *clean dep depend

1 0

r26594 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 10:35:58 2008 New Revision: 26594 Log: cosmetics: Move version.h/help_mp.h generation rules to a better place. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 10:35:58 2008 @@ -698,6 +698,28 @@ $(DEPS) recurse: help_mp.h version.h cod dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done +# rebuild at every config.h/config.mak change: +version.h: config.h config.mak + ./version.sh `$(CC) -dumpversion` + +help_mp.h: help/help_mp-en.h $(HELP_FILE) + @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h + @echo '// See the help/ subdir for the editable files.' >> help_mp.h + @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h + @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h +ifeq ($(CHARSET),) + @echo '#include "$(HELP_FILE)"' >> help_mp.h +else + iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h +endif + @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h + +ifneq ($(HELP_FILE),help/help_mp-en.h) + @echo "Adding untranslated messages to help_mp.h" + @echo '// untranslated messages from the English master file:' >> help_mp.h + @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h +endif + define RECURSIVE_RULE $(part)/$(part).a: $(MAKE) -C $(part) @@ -847,34 +869,12 @@ config.mak: configure @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -# rebuild at every config.h/config.mak change: -version.h: config.h config.mak - ./version.sh `$(CC) -dumpversion` - doxygen: doxygen DOCS/tech/Doxyfile doxygen_clean: -rm -rf DOCS/tech/doxygen -help_mp.h: help/help_mp-en.h $(HELP_FILE) - @echo '// WARNING! This is a generated file. Do NOT edit.' > help_mp.h - @echo '// See the help/ subdir for the editable files.' >> help_mp.h - @echo '#ifndef MPLAYER_HELP_MP_H' >> help_mp.h - @echo '#define MPLAYER_HELP_MP_H' >> help_mp.h -ifeq ($(CHARSET),) - @echo '#include "$(HELP_FILE)"' >> help_mp.h -else - iconv -f UTF-8 -t $(CHARSET) "$(HELP_FILE)" >> help_mp.h -endif - @echo '#endif /* MPLAYER_HELP_MP_H */' >> help_mp.h - -ifneq ($(HELP_FILE),help/help_mp-en.h) - @echo "Adding untranslated messages to help_mp.h" - @echo '// untranslated messages from the English master file:' >> help_mp.h - @help/help_diff.sh $(HELP_FILE) < help/help_mp-en.h >> help_mp.h -endif - TOOLS = TOOLS/alaw-gen$(EXESUF) \ TOOLS/asfinfo$(EXESUF) \

1 0

r26593 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 10:05:44 2008 New Revision: 26593 Log: 10l: Add missing \ for line continuation. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 10:05:44 2008 @@ -829,7 +829,7 @@ distclean: clean doxygen_clean rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) \ - codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) + codec-cfg$(EXESUF) codecs2html$(EXESUF) codec-cfg-test$(EXESUF) \ cpuinfo$(EXESUF) TAGS tags strip:

1 0

r26592 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 10:04:59 2008 New Revision: 26592 Log: Do not rebuild version.h at every Makefile change. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 10:04:59 2008 @@ -847,8 +847,8 @@ config.mak: configure @echo "####### Please run ./configure again - it's changed! #######" @echo "############################################################" -# rebuild at every config.h/config.mak/Makefile change: -version.h: config.h config.mak Makefile +# rebuild at every config.h/config.mak change: +version.h: config.h config.mak ./version.sh `$(CC) -dumpversion` doxygen:

1 0

r26591 - trunk/Makefile
by diego 29 Apr '08

29 Apr '08

Author: diego Date: Tue Apr 29 09:37:35 2008 New Revision: 26591 Log: Convert clean/distclean into non-recursive targets. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Tue Apr 29 09:37:35 2008 @@ -652,6 +652,17 @@ DIRS = . \ libaf \ libao2 \ libass \ + libavcodec \ + libavcodec/alpha \ + libavcodec/armv4l \ + libavcodec/bfin \ + libavcodec/i386 \ + libavcodec/mlib \ + libavcodec/ppc \ + libavcodec/sh4 \ + libavcodec/sparc \ + libavformat \ + libavutil \ libdvdcss \ libfaad2 \ libmenu \ @@ -659,6 +670,8 @@ DIRS = . \ libmpcodecs/native \ libmpdemux \ libmpeg2 \ + libpostproc \ + libswscale \ libvo \ loader \ loader/dshow \ @@ -809,12 +822,10 @@ uninstall: done 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 $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) distclean: clean doxygen_clean - for part in $(PARTS); do $(MAKE) -C $$part distclean; done rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir)))) rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \ version.h $(VIDIX_PCI_FILES) \

1 0