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

r26610 - in trunk: Makefile TOOLS/subrip.c
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 16:00:32 2008 New Revision: 26610 Log: Remove unused fast_memcpy() function and link against the object that contains fast_memcpy() instead. Modified: trunk/Makefile trunk/TOOLS/subrip.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 16:00:32 2008 @@ -929,7 +929,8 @@ TOOLS_COMMON_LIBS = mp_msg-mencoder.o mp TOOLS/bmovl-test$(EXESUF): TOOLS/bmovl-test.c -lSDL_image TOOLS/subrip$(EXESUF): TOOLS/subrip.c vobsub.o spudec.o unrar_exec.o \ - libswscale/libswscale.a libavutil/libavutil.a $(TOOLS_COMMON_LIBS) + libvo/aclib.o libswscale/libswscale.a libavutil/libavutil.a \ + $(TOOLS_COMMON_LIBS) TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 Modified: trunk/TOOLS/subrip.c ============================================================================== --- trunk/TOOLS/subrip.c (original) +++ trunk/TOOLS/subrip.c Wed Apr 30 16:00:32 2008 @@ -187,12 +187,6 @@ draw_alpha(int x0, int y0, int w, int h, unlink(tmpfname); } -static void -fast_memcpy(void *a, void *b, int s) -{ //FIXME - memcpy(a, b, s); -} - int main(int argc, char **argv) {

1 0

r26609 - trunk/Makefile
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 15:58:26 2008 New Revision: 26609 Log: cosmetics: Move some variable declarations to better places. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 15:58:26 2008 @@ -582,8 +582,6 @@ SRCS_MPLAYER-$(VIDIX_S3) SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c -OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o - SRCS_MENCODER = mencoder.c \ mp_msg-mencoder.c \ parser-mecmd.c \ @@ -611,30 +609,29 @@ SRCS_MENCODER-$(WIN32DLL) += lib SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c -COMMON_LIBS = libswscale/libswscale.a \ +SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes) +SRCS_MENCODER += $(SRCS_MENCODER-yes) +SRCS_MPLAYER += $(SRCS_MPLAYER-yes) COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a +COMMON_LIBS = libswscale/libswscale.a +COMMON_LIBS += $(COMMON_LIBS-yes) -ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) -ALL_PRG-$(MENCODER) += mencoder$(EXESUF) - -COMMON_LIBS += $(COMMON_LIBS-yes) -OBJS_MPLAYER += $(OBJS_MPLAYER-yes) -ALL_PRG += $(ALL_PRG-yes) +OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON))) +OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER))) +OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER))) +OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o +OBJS_MPLAYER += $(OBJS_MPLAYER-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)) ) +ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) +ALL_PRG-$(MENCODER) += mencoder$(EXESUF) +ALL_PRG += $(ALL_PRG-yes) INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man

1 0

r26608 - trunk/TOOLS/movinfo.c
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 15:57:15 2008 New Revision: 26608 Log: Disable unused function. Modified: trunk/TOOLS/movinfo.c Modified: trunk/TOOLS/movinfo.c ============================================================================== --- trunk/TOOLS/movinfo.c (original) +++ trunk/TOOLS/movinfo.c Wed Apr 30 15:57:15 2008 @@ -98,6 +98,7 @@ static void audio_stream_info(FILE *f, i fseek(f,orig_pos,SEEK_SET); } +#if 0 static void userdata_info(FILE *f, int len, int pos, int level) { int orig_pos = pos; /*ftell(f);*/ @@ -150,6 +151,7 @@ static void userdata_info(FILE *f, int l } fseek(f,orig_pos,SEEK_SET); } +#endif int time_scale = 0;

1 0

r26607 - in trunk/TOOLS: asfinfo.c fastmemcpybench.c modify_reg.c movinfo.c netstream.c subrip.c vfw2menc.c vivodump.c
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 15:53:40 2008 New Revision: 26607 Log: Mark all functions that are only used within the file as static. Modified: trunk/TOOLS/asfinfo.c trunk/TOOLS/fastmemcpybench.c trunk/TOOLS/modify_reg.c trunk/TOOLS/movinfo.c trunk/TOOLS/netstream.c trunk/TOOLS/subrip.c trunk/TOOLS/vfw2menc.c trunk/TOOLS/vivodump.c Modified: trunk/TOOLS/asfinfo.c ============================================================================== --- trunk/TOOLS/asfinfo.c (original) +++ trunk/TOOLS/asfinfo.c Wed Apr 30 15:53:40 2008 @@ -89,7 +89,7 @@ unsigned char buffer[8192]; int i; -char* chunk_type(unsigned char* guid){ +static char* chunk_type(unsigned char* guid){ switch(*((unsigned int*)guid)){ case 0xF8699E40: return "guid_audio_stream"; case 0xBC19EFC0: return "guid_video_stream"; @@ -105,7 +105,7 @@ char* chunk_type(unsigned char* guid){ return NULL; } -void print_wave_header(WAVEFORMATEX *h){ +static void print_wave_header(WAVEFORMATEX *h){ printf("======= WAVE Format =======\n"); @@ -135,7 +135,7 @@ void print_wave_header(WAVEFORMATEX *h){ } -void print_video_header(BITMAPINFOHEADER *h){ +static void print_video_header(BITMAPINFOHEADER *h){ printf("======= VIDEO Format ======\n"); printf(" biSize %ld\n", h->biSize); printf(" biWidth %ld\n", h->biWidth); Modified: trunk/TOOLS/fastmemcpybench.c ============================================================================== --- trunk/TOOLS/fastmemcpybench.c (original) +++ trunk/TOOLS/fastmemcpybench.c Wed Apr 30 15:53:40 2008 @@ -74,7 +74,7 @@ static int mga_init(){ #endif // Returns current time in microseconds -unsigned int GetTimer(){ +static unsigned int GetTimer(){ struct timeval tv; struct timezone tz; // float s; Modified: trunk/TOOLS/modify_reg.c ============================================================================== --- trunk/TOOLS/modify_reg.c (original) +++ trunk/TOOLS/modify_reg.c Wed Apr 30 15:53:40 2008 @@ -53,7 +53,7 @@ static void remove_key(long handle, cons save_registry(); } -void parse_key(char *raw, HKEY *root, char *path, char *key) { +static void parse_key(char *raw, HKEY *root, char *path, char *key) { char *tmpkey, *start; tmpkey = strrchr(raw, '\\'); if (tmpkey == raw || tmpkey == NULL) { Modified: trunk/TOOLS/movinfo.c ============================================================================== --- trunk/TOOLS/movinfo.c (original) +++ trunk/TOOLS/movinfo.c Wed Apr 30 15:53:40 2008 @@ -22,7 +22,7 @@ #undef NO_SPECIAL -char *atom2human_type(int type) +static char *atom2human_type(int type) { switch (type) { @@ -57,13 +57,13 @@ int stream = S_NONE; int v_stream = 0; int a_stream = 0; -unsigned int read_dword(FILE *f){ +static unsigned int read_dword(FILE *f){ unsigned char atom_size_b[4]; if(fread(&atom_size_b,4,1,f)<=0) return -1; return (atom_size_b[0]<<24)|(atom_size_b[1]<<16)|(atom_size_b[2]<<8)|atom_size_b[3]; } -void video_stream_info(FILE *f, int len) +static void video_stream_info(FILE *f, int len) { int orig_pos = ftell(f); unsigned char data[len-8]; @@ -79,7 +79,7 @@ void video_stream_info(FILE *f, int len) fseek(f,orig_pos,SEEK_SET); } -void audio_stream_info(FILE *f, int len) +static void audio_stream_info(FILE *f, int len) { int orig_pos = ftell(f); unsigned char data[len-8]; @@ -98,7 +98,7 @@ void audio_stream_info(FILE *f, int len) fseek(f,orig_pos,SEEK_SET); } -void userdata_info(FILE *f, int len, int pos, int level) +static void userdata_info(FILE *f, int len, int pos, int level) { int orig_pos = pos; /*ftell(f);*/ unsigned int atom_size = 1; @@ -153,7 +153,7 @@ void userdata_info(FILE *f, int len, int int time_scale = 0; -void lschunks(FILE *f,int level,unsigned int endpos){ +static void lschunks(FILE *f,int level,unsigned int endpos){ unsigned int atom_size; unsigned int atom_type; int pos; Modified: trunk/TOOLS/netstream.c ============================================================================== --- trunk/TOOLS/netstream.c (original) +++ trunk/TOOLS/netstream.c Wed Apr 30 15:53:40 2008 @@ -181,7 +181,7 @@ static int net_stream_close(client_t* cl return 1; } -int handle_client(client_t* cl,mp_net_stream_packet_t* pack) { +static int handle_client(client_t* cl,mp_net_stream_packet_t* pack) { if(!pack) return 0; Modified: trunk/TOOLS/subrip.c ============================================================================== --- trunk/TOOLS/subrip.c (original) +++ trunk/TOOLS/subrip.c Wed Apr 30 15:53:40 2008 @@ -187,7 +187,7 @@ draw_alpha(int x0, int y0, int w, int h, unlink(tmpfname); } -void +static void fast_memcpy(void *a, void *b, int s) { //FIXME memcpy(a, b, s); Modified: trunk/TOOLS/vfw2menc.c ============================================================================== --- trunk/TOOLS/vfw2menc.c (original) +++ trunk/TOOLS/vfw2menc.c Wed Apr 30 15:53:40 2008 @@ -59,7 +59,7 @@ enum MODE_VIEW }; -int save_settings(HDRVR hDriver, const char *filename) +static int save_settings(HDRVR hDriver, const char *filename) { FILE *fd = NULL; DWORD cb = (DWORD) SendDriverMessage(hDriver, ICM_GETSTATE, 0, 0); @@ -99,7 +99,7 @@ int save_settings(HDRVR hDriver, const c return 0; } -int load_settings(HDRVR hDriver, const char *filename) +static int load_settings(HDRVR hDriver, const char *filename) { struct stat info; FILE *fd = NULL; @@ -150,7 +150,7 @@ static struct option long_options[] = { 0, 0, 0, 0 } }; -void help(const char *progname) +static void help(const char *progname) { printf("VFW to mencoder v"VERSION" - Copyright 2007 - Gianluigi Tiesi <sherpya(a)netfarm.it>\n"); printf("This program is Free Software\n\n"); Modified: trunk/TOOLS/vivodump.c ============================================================================== --- trunk/TOOLS/vivodump.c (original) +++ trunk/TOOLS/vivodump.c Wed Apr 30 15:53:40 2008 @@ -34,7 +34,7 @@ int bufptr=0; int bitcnt=0; unsigned char buf=0; -unsigned int x_get_bits(int n){ +static unsigned int x_get_bits(int n){ unsigned int x=0; while(n-->0){ if(!bitcnt){ @@ -59,7 +59,7 @@ int width=320; int height=240; /* most is hardcoded. should extend to handle all h263 streams */ -int h263_decode_picture_header(unsigned char *b_ptr) +static int h263_decode_picture_header(unsigned char *b_ptr) { int i;

1 0

r26606 - trunk/Makefile
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 14:38:38 2008 New Revision: 26606 Log: The recurse target does not depend on help_mp.h. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 14:38:38 2008 @@ -717,7 +717,7 @@ recurse: codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER)))) -$(DEPS) recurse: help_mp.h +$(DEPS): help_mp.h dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done

1 0

r26605 - trunk/Makefile
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 14:37:49 2008 New Revision: 26605 Log: Make the default target depend on the recurse target again so that the all necessary subdirectories are recursed by default. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 14:37:49 2008 @@ -694,7 +694,7 @@ DIRS = . \ TOOLS \ vidix \ -all: $(ALL_PRG) +all: recurse $(ALL_PRG) recurse: for part in $(PARTS); do $(MAKE) -C $$part; done @@ -754,8 +754,6 @@ endef $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) -$(OBJS): recurse - mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $^ $(LDFLAGS_MPLAYER)

1 0

r26604 - trunk/Makefile
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 14:19:04 2008 New Revision: 26604 Log: Explicitly declare which dependency files need generated headers. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 14:19:04 2008 @@ -714,8 +714,11 @@ recurse: %.o: %.m $(CC) $(CFLAGS) -c -o $@ $< +codec-cfg.d: codecs.conf.h +mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h 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 +$(DEPS) recurse: help_mp.h + dep depend: $(DEPS) for part in $(PARTS); do $(MAKE) -C $$part depend; done

1 0

r26603 - trunk/osdep/mplayer.rc
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 13:06:07 2008 New Revision: 26603 Log: Use consistent include paths, we always build from the top level now. Modified: trunk/osdep/mplayer.rc Modified: trunk/osdep/mplayer.rc ============================================================================== --- trunk/osdep/mplayer.rc (original) +++ trunk/osdep/mplayer.rc Wed Apr 30 13:06:07 2008 @@ -4,7 +4,7 @@ and add resfile.o to OBJS_MPLAYER in Makefile*/ #include <winver.h> -#include "../version.h" +#include "version.h" 1 VERSIONINFO FILEVERSION 0,0,9,0 @@ -35,5 +35,5 @@ FILETYPE VFT_APP } } -IDI_ICON1 ICON DISCARDABLE "../etc/mplayer.ico" +IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico"

1 0

r26602 - in trunk: libmenu/menu_cmdlist.c libmpdemux/muxer.c libmpdemux/muxer_lavf.c libmpdemux/muxer_mpeg.c libmpdemux/muxer_rawvideo.c
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 13:03:41 2008 New Revision: 26602 Log: Remove unnecessary version.h #includes. Modified: trunk/libmenu/menu_cmdlist.c trunk/libmpdemux/muxer.c trunk/libmpdemux/muxer_lavf.c trunk/libmpdemux/muxer_mpeg.c trunk/libmpdemux/muxer_rawvideo.c Modified: trunk/libmenu/menu_cmdlist.c ============================================================================== --- trunk/libmenu/menu_cmdlist.c (original) +++ trunk/libmenu/menu_cmdlist.c Wed Apr 30 13:03:41 2008 @@ -20,7 +20,6 @@ #include "libvo/font_load.h" #include "input/input.h" -#include "version.h" Modified: trunk/libmpdemux/muxer.c ============================================================================== --- trunk/libmpdemux/muxer.c (original) +++ trunk/libmpdemux/muxer.c Wed Apr 30 13:03:41 2008 @@ -6,8 +6,6 @@ #include <unistd.h> #include "config.h" -#include "version.h" - #include "aviheader.h" #include "ms_hdr.h" Modified: trunk/libmpdemux/muxer_lavf.c ============================================================================== --- trunk/libmpdemux/muxer_lavf.c (original) +++ trunk/libmpdemux/muxer_lavf.c Wed Apr 30 13:03:41 2008 @@ -5,7 +5,6 @@ #include <inttypes.h> #include <limits.h> #include "config.h" -#include "version.h" #include "mp_msg.h" #include "help_mp.h" Modified: trunk/libmpdemux/muxer_mpeg.c ============================================================================== --- trunk/libmpdemux/muxer_mpeg.c (original) +++ trunk/libmpdemux/muxer_mpeg.c Wed Apr 30 13:03:41 2008 @@ -6,7 +6,6 @@ #include <sys/types.h> #include "config.h" -#include "version.h" #include "mp_msg.h" #include "help_mp.h" Modified: trunk/libmpdemux/muxer_rawvideo.c ============================================================================== --- trunk/libmpdemux/muxer_rawvideo.c (original) +++ trunk/libmpdemux/muxer_rawvideo.c Wed Apr 30 13:03:41 2008 @@ -6,8 +6,6 @@ #include <unistd.h> #include "config.h" -#include "version.h" - //#include "stream/stream.h" //#include "demuxer.h" //#include "stheader.h"

1 0

r26601 - trunk/Makefile
by diego 30 Apr '08

30 Apr '08

Author: diego Date: Wed Apr 30 12:57:45 2008 New Revision: 26601 Log: Rebuild version.h only when the working directory was updated. Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed Apr 30 12:57:45 2008 @@ -719,8 +719,11 @@ $(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 +# rebuild version.h each time the working copy is updated +ifeq ($(wildcard .svn/entries),.svn/entries) +version.h: .svn/entries +endif +version.h: ./version.sh `$(CC) -dumpversion` help_mp.h: help/help_mp-en.h $(HELP_FILE)

1 0