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

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r26345 - trunk/libao2/ao_sun.c
by reimar 08 Mar '09

08 Mar '09

Author: reimar Date: Mon Apr 7 19:39:41 2008 New Revision: 26345 Log: reset() should not senselessly close and reopen the device but instead just call flush_audio() Modified: trunk/libao2/ao_sun.c Modified: trunk/libao2/ao_sun.c ============================================================================== --- trunk/libao2/ao_sun.c (original) +++ trunk/libao2/ao_sun.c Mon Apr 7 19:39:41 2008 @@ -588,29 +588,7 @@ static void uninit(int immed){ // stop playing and empty buffers (for seeking/pause) static void reset(void){ - audio_info_t info; - - uninit(1); - audio_fd=open(audio_dev, O_WRONLY); - if(audio_fd<0){ - mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_SUN_CantReopenReset, strerror(errno)); - return; - } - - ioctl(audio_fd, AUDIO_DRAIN, 0); - - AUDIO_INITINFO(&info); - info.play.encoding = af2sunfmt(ao_data.format); - info.play.precision = - (ao_data.format==AF_FORMAT_S16_NE - ? AUDIO_PRECISION_16 - : AUDIO_PRECISION_8); - info.play.channels = ao_data.channels; - info.play.sample_rate = ao_data.samplerate; - info.play.samples = 0; - info.play.eof = 0; - info.play.error = 0; - ioctl (audio_fd, AUDIO_SETINFO, &info); + flush_audio(audio_fd); queued_bursts = 0; queued_samples = 0; }

4 4

r23335 - in trunk: configure vidix/Makefile
by diego 04 Feb '09

04 Feb '09

Author: diego Date: Thu May 17 23:48:56 2007 New Revision: 23335 Log: Remove awk test. awk is a basic Unix tool, any implementation is sufficient. Modified: trunk/configure trunk/vidix/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 17 23:48:56 2007 @@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then beos && _vidix_internal=no darwin && _vidix_internal=no fi - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi if test "$_vidix_internal" = yes; then _res_comment="internal" @@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR) #AR = ar CC = $_cc HOST_CC = $_host_cc -AWK = $_awk RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install Modified: trunk/vidix/Makefile ============================================================================== --- trunk/vidix/Makefile (original) +++ trunk/vidix/Makefile Thu May 17 23:48:56 2007 @@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< pci_names.c pci_dev_ids.c: pci.db - LC_ALL=C $(AWK) -f pci_db2c.awk $< + LC_ALL=C awk -f pci_db2c.awk $< clean:: rm -f pci_*.c pci_*.h

5 8

r26914 - in trunk: DOCS/xml/en/video.xml Makefile drivers/Makefile
by diego 10 Sep '08

10 Sep '08

Author: diego Date: Wed May 28 14:40:15 2008 New Revision: 26914 Log: Merge drivers/Makefile into top-level Makefile. Removed: trunk/drivers/Makefile Modified: trunk/Makefile Changes in other areas also in this revision: Modified: trunk/DOCS/xml/en/video.xml Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Wed May 28 14:40:15 2008 @@ -840,7 +840,7 @@ clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) rm -f mplayer$(EXESUF) mencoder$(EXESUF) -distclean: clean testsclean toolsclean +distclean: clean testsclean toolsclean driversclean rm -rf DOCS/tech/doxygen 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 \ @@ -957,7 +957,41 @@ NETSTREAM_DEPS = libavutil/libavutil.a \ TOOLS/netstream$(EXESUF): TOOLS/netstream.o $(NETSTREAM_DEPS) $(CC) $(CFLAGS) -o $@ $^ + + +###### drivers ####### + +KERNEL_INC = /lib/modules/`uname -r`/build/include +KERNEL_VERSION = $(shell grep RELEASE $(KERNEL_INC)/linux/version.h | cut -d'"' -f2) +KERNEL_CFLAGS = -O2 -D__KERNEL__ -DMODULE -Wall -I$(KERNEL_INC) -include $(KERNEL_INC)/linux/modversions.h +KERNEL_OBJS = $(addprefix drivers/, mga_vid.o tdfx_vid.o radeon_vid.o rage128_vid.o) +MODULES_DIR = /lib/modules/$(KERNEL_VERSION)/misc + +drivers: $(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test + +$(KERNEL_OBJS) drivers/mga_vid_test drivers/tdfx_vid_test: CFLAGS = $(KERNEL_CFLAGS) +drivers/mga_vid.o: drivers/mga_vid.c drivers/mga_vid.h +drivers/tdfx_vid.o: drivers/tdfx_vid.c drivers/3dfx.h +drivers/radeon_vid.o drivers/rage128_vid.o: CFLAGS += -fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math +drivers/radeon_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h +drivers/rage128_vid.o: drivers/radeon_vid.c drivers/radeon.h drivers/radeon_vid.h + $(CC) $(CFLAGS) -DRAGE128 -c $< -o $@ + +install-drivers: + -mkdir -p $(MODULES_DIR) + install -m 644 $(KERNEL_OBJS) $(MODULES_DIR) + depmod -a + -mknod /dev/mga_vid c 178 0 + -mknod /dev/tdfx_vid c 178 0 + -mknod /dev/radeon_vid c 178 0 + -ln -s /dev/radeon_vid /dev/rage128_vid + +driversclean: + rm -f drivers/*.o drivers/*~ drivers/mga_vid_test drivers/tdfx_vid_test + + + -include $(DEPS) -.PHONY: all doxygen *install* recurse *tools +.PHONY: all doxygen *install* recurse *tools drivers .PHONY: checkheaders *clean dep depend tests

5 5

r27504 - in trunk/stream: asf_mmst_streaming.c asf_streaming.c http.c librtsp/rtsp_session.c network.c network.h pnm.c rtp.c stream.c stream_ftp.c stream_netstream.c stream_rtsp.c tcp.c udp.c
by diego 31 Aug '08

31 Aug '08

Author: diego Date: Sun Aug 31 15:59:54 2008 New Revision: 27504 Log: Revert moving closesocket definition and network headers to network.h. This caused lots of trouble on MinGW, we need a different solution. Modified: trunk/stream/asf_mmst_streaming.c trunk/stream/asf_streaming.c trunk/stream/http.c trunk/stream/librtsp/rtsp_session.c trunk/stream/network.c trunk/stream/network.h trunk/stream/pnm.c trunk/stream/rtp.c trunk/stream/stream.c trunk/stream/stream_ftp.c trunk/stream/stream_netstream.c trunk/stream/stream_rtsp.c trunk/stream/tcp.c trunk/stream/udp.c Modified: trunk/stream/asf_mmst_streaming.c ============================================================================== --- trunk/stream/asf_mmst_streaming.c (original) +++ trunk/stream/asf_mmst_streaming.c Sun Aug 31 15:59:54 2008 @@ -39,6 +39,12 @@ #include "mp_msg.h" #include "help_mp.h" +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#else +#include <winsock2.h> +#endif + #ifndef CONFIG_SETLOCALE #undef CONFIG_ICONV #endif Modified: trunk/stream/asf_streaming.c ============================================================================== --- trunk/stream/asf_streaming.c (original) +++ trunk/stream/asf_streaming.c Sun Aug 31 15:59:54 2008 @@ -8,6 +8,13 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" + +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#else +#include <winsock2.h> +#endif + #include "url.h" #include "http.h" #include "libmpdemux/asf.h" Modified: trunk/stream/http.c ============================================================================== --- trunk/stream/http.c (original) +++ trunk/stream/http.c Sun Aug 31 15:59:54 2008 @@ -11,6 +11,14 @@ #include <string.h> #include <unistd.h> +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + +#include "http.h" #include "url.h" #include "mp_msg.h" Modified: trunk/stream/librtsp/rtsp_session.c ============================================================================== --- trunk/stream/librtsp/rtsp_session.c (original) +++ trunk/stream/librtsp/rtsp_session.c Sun Aug 31 15:59:54 2008 @@ -29,6 +29,17 @@ */ #include <sys/types.h> +#include "config.h" +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#include <sys/socket.h> +#include <netinet/in.h> +#include <netdb.h> +#else +#include <winsock2.h> +#endif + + #include <unistd.h> #include <stdio.h> #include <fcntl.h> @@ -36,12 +47,10 @@ #include <string.h> #include <inttypes.h> -#include "config.h" #include "mp_msg.h" #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "stream/network.h" #include "stream/url.h" #include "stream/rtp.h" #include "stream/realrtsp/real.h" Modified: trunk/stream/network.c ============================================================================== --- trunk/stream/network.c (original) +++ trunk/stream/network.c Sun Aug 31 15:59:54 2008 @@ -18,6 +18,14 @@ #include "mp_msg.h" #include "help_mp.h" + +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + #include "stream.h" #include "libmpdemux/demuxer.h" #include "m_config.h" Modified: trunk/stream/network.h ============================================================================== --- trunk/stream/network.h (original) +++ trunk/stream/network.h Sun Aug 31 15:59:54 2008 @@ -17,10 +17,6 @@ #include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> #endif #include "url.h" Modified: trunk/stream/pnm.c ============================================================================== --- trunk/stream/pnm.c (original) +++ trunk/stream/pnm.c Sun Aug 31 15:59:54 2008 @@ -35,9 +35,17 @@ #include <stdlib.h> #include <sys/time.h> #include <inttypes.h> +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#include <sys/socket.h> +//#include <netinet/in.h> +//#include <netdb.h> +#else +#include <winsock2.h> +#endif #include "libavutil/intreadwrite.h" -#include "network.h" + #include "stream.h" #include "libmpdemux/demuxer.h" #include "help_mp.h" Modified: trunk/stream/rtp.c ============================================================================== --- trunk/stream/rtp.c (original) +++ trunk/stream/rtp.c Sun Aug 31 15:59:54 2008 @@ -12,9 +12,17 @@ #include <stdio.h> #include <sys/types.h> #include <ctype.h> -#include <errno.h> #include "config.h" -#include "network.h" +#ifndef HAVE_WINSOCK2_H +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif +#include <errno.h> #include "stream.h" /* MPEG-2 TS RTP stack */ Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c (original) +++ trunk/stream/stream.c Sun Aug 31 15:59:54 2008 @@ -13,10 +13,17 @@ #include <strings.h> #include "config.h" + +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#else +#include <winsock2.h> +#endif + #include "mp_msg.h" #include "help_mp.h" #include "osdep/shmem.h" -#include "network.h" + #include "stream.h" #include "libmpdemux/demuxer.h" Modified: trunk/stream/stream_ftp.c ============================================================================== --- trunk/stream/stream_ftp.c (original) +++ trunk/stream/stream_ftp.c Sun Aug 31 15:59:54 2008 @@ -9,9 +9,14 @@ #include <fcntl.h> #include <unistd.h> #include <errno.h> +#ifndef HAVE_WINSOCK2_H +#include <sys/socket.h> +#define closesocket close +#else +#include <winsock2.h> +#endif #include "mp_msg.h" -#include "network.h" #include "stream.h" #include "help_mp.h" #include "m_option.h" Modified: trunk/stream/stream_netstream.c ============================================================================== --- trunk/stream/stream_netstream.c (original) +++ trunk/stream/stream_netstream.c Sun Aug 31 15:59:54 2008 @@ -42,6 +42,15 @@ #include <inttypes.h> #include <errno.h> +#ifndef HAVE_WINSOCK2_H +#define closesocket close +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> +#else +#include <winsock2.h> +#endif + #include "mp_msg.h" #include "stream.h" #include "help_mp.h" Modified: trunk/stream/stream_rtsp.c ============================================================================== --- trunk/stream/stream_rtsp.c (original) +++ trunk/stream/stream_rtsp.c Sun Aug 31 15:59:54 2008 @@ -27,10 +27,18 @@ #include <stdio.h> #include <sys/types.h> #include <ctype.h> +#include "config.h" +#ifndef HAVE_WINSOCK2_H +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif #include <errno.h> -#include "config.h" -#include "network.h" #include "stream.h" #include "tcp.h" #include "librtsp/rtsp.h" Modified: trunk/stream/tcp.c ============================================================================== --- trunk/stream/tcp.c (original) +++ trunk/stream/tcp.c Sun Aug 31 15:59:54 2008 @@ -19,7 +19,18 @@ #include "mp_msg.h" #include "help_mp.h" -#include "network.h" + +#ifndef HAVE_WINSOCK2_H +#include <netdb.h> +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + #include "stream.h" #include "tcp.h" Modified: trunk/stream/udp.c ============================================================================== --- trunk/stream/udp.c (original) +++ trunk/stream/udp.c Sun Aug 31 15:59:54 2008 @@ -31,8 +31,18 @@ #include <sys/time.h> #include <ctype.h> +#ifndef HAVE_WINSOCK2_H +#include <netdb.h> +#include <netinet/in.h> +#include <sys/socket.h> +#include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> +#endif + #include "mp_msg.h" -#include "network.h" #include "url.h" #include "udp.h"

1 0

r27503 - trunk/configure
by diego 31 Aug '08

31 Aug '08

Author: diego Date: Sun Aug 31 15:56:18 2008 New Revision: 27503 Log: Only use winsock2.h to check for closesocket(). Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sun Aug 31 15:56:18 2008 @@ -2896,13 +2896,11 @@ echores "$_socklen_t" echocheck "closesocket()" _closesocket=no -for header in "arpa/inet.h" "winsock2.h" ; do - cat > $TMPC << EOF -#include <$header> +cat > $TMPC << EOF +#include <winsock2.h> int main(void) { closesocket(~0); return 0; } EOF - cc_check $_ld_sock && _closesocket=yes && break -done +cc_check $_ld_sock && _closesocket=yes if test "$_closesocket" = yes ; then _def_closesocket='#define HAVE_CLOSESOCKET 1' else

1 0

r27502 - trunk/configure
by diego 31 Aug '08

31 Aug '08

Author: diego Date: Sun Aug 31 15:54:08 2008 New Revision: 27502 Log: Fix closesocket test, patch by Serge Levin, serge.levin.spb gmail com. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sun Aug 31 15:54:08 2008 @@ -2899,9 +2899,9 @@ _closesocket=no for header in "arpa/inet.h" "winsock2.h" ; do cat > $TMPC << EOF #include <$header> -int main(void) { closesocket(); return 0; } +int main(void) { closesocket(~0); return 0; } EOF - cc_check && _closesocket=yes && break + cc_check $_ld_sock && _closesocket=yes && break done if test "$_closesocket" = yes ; then _def_closesocket='#define HAVE_CLOSESOCKET 1'

1 0

r27496 - in trunk/stream: asf_mmst_streaming.c asf_streaming.c http.c librtsp/rtsp_session.c network.c network.h pnm.c rtp.c stream.c stream_ftp.c stream_netstream.c stream_rtsp.c tcp.c udp.c
by diego 31 Aug '08

31 Aug '08

Author: diego Date: Sat Aug 30 00:55:39 2008 New Revision: 27496 Log: Move duplicated '#define closesocket close' into network.h along with network-related #include #ifdeffery. Modified: trunk/stream/asf_mmst_streaming.c trunk/stream/asf_streaming.c trunk/stream/http.c trunk/stream/librtsp/rtsp_session.c trunk/stream/network.c trunk/stream/network.h trunk/stream/pnm.c trunk/stream/rtp.c trunk/stream/stream.c trunk/stream/stream_ftp.c trunk/stream/stream_netstream.c trunk/stream/stream_rtsp.c trunk/stream/tcp.c trunk/stream/udp.c Modified: trunk/stream/asf_mmst_streaming.c ============================================================================== --- trunk/stream/asf_mmst_streaming.c (original) +++ trunk/stream/asf_mmst_streaming.c Sat Aug 30 00:55:39 2008 @@ -39,12 +39,6 @@ #include "mp_msg.h" #include "help_mp.h" -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#else -#include <winsock2.h> -#endif - #ifndef CONFIG_SETLOCALE #undef CONFIG_ICONV #endif Modified: trunk/stream/asf_streaming.c ============================================================================== --- trunk/stream/asf_streaming.c (original) +++ trunk/stream/asf_streaming.c Sat Aug 30 00:55:39 2008 @@ -8,13 +8,6 @@ #include "config.h" #include "mp_msg.h" #include "help_mp.h" - -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#else -#include <winsock2.h> -#endif - #include "url.h" #include "http.h" #include "libmpdemux/asf.h" Modified: trunk/stream/http.c ============================================================================== --- trunk/stream/http.c (original) +++ trunk/stream/http.c Sat Aug 30 00:55:39 2008 @@ -11,14 +11,6 @@ #include <string.h> #include <unistd.h> -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif - -#include "http.h" #include "url.h" #include "mp_msg.h" Modified: trunk/stream/librtsp/rtsp_session.c ============================================================================== --- trunk/stream/librtsp/rtsp_session.c (original) +++ trunk/stream/librtsp/rtsp_session.c Sat Aug 30 00:55:39 2008 @@ -29,17 +29,6 @@ */ #include <sys/types.h> -#include "config.h" -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#include <sys/socket.h> -#include <netinet/in.h> -#include <netdb.h> -#else -#include <winsock2.h> -#endif - - #include <unistd.h> #include <stdio.h> #include <fcntl.h> @@ -47,10 +36,12 @@ #include <string.h> #include <inttypes.h> +#include "config.h" #include "mp_msg.h" #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" +#include "stream/network.h" #include "stream/url.h" #include "stream/rtp.h" #include "stream/realrtsp/real.h" Modified: trunk/stream/network.c ============================================================================== --- trunk/stream/network.c (original) +++ trunk/stream/network.c Sat Aug 30 00:55:39 2008 @@ -18,14 +18,6 @@ #include "mp_msg.h" #include "help_mp.h" - -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif - #include "stream.h" #include "libmpdemux/demuxer.h" #include "m_config.h" Modified: trunk/stream/network.h ============================================================================== --- trunk/stream/network.h (original) +++ trunk/stream/network.h Sat Aug 30 00:55:39 2008 @@ -17,6 +17,10 @@ #include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> +#define closesocket close +#else +#include <winsock2.h> +#include <ws2tcpip.h> #endif #include "url.h" Modified: trunk/stream/pnm.c ============================================================================== --- trunk/stream/pnm.c (original) +++ trunk/stream/pnm.c Sat Aug 30 00:55:39 2008 @@ -35,17 +35,9 @@ #include <stdlib.h> #include <sys/time.h> #include <inttypes.h> -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#include <sys/socket.h> -//#include <netinet/in.h> -//#include <netdb.h> -#else -#include <winsock2.h> -#endif #include "libavutil/intreadwrite.h" - +#include "network.h" #include "stream.h" #include "libmpdemux/demuxer.h" #include "help_mp.h" Modified: trunk/stream/rtp.c ============================================================================== --- trunk/stream/rtp.c (original) +++ trunk/stream/rtp.c Sat Aug 30 00:55:39 2008 @@ -12,17 +12,9 @@ #include <stdio.h> #include <sys/types.h> #include <ctype.h> -#include "config.h" -#ifndef HAVE_WINSOCK2_H -#include <netinet/in.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif #include <errno.h> +#include "config.h" +#include "network.h" #include "stream.h" /* MPEG-2 TS RTP stack */ Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c (original) +++ trunk/stream/stream.c Sat Aug 30 00:55:39 2008 @@ -13,17 +13,10 @@ #include <strings.h> #include "config.h" - -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#else -#include <winsock2.h> -#endif - #include "mp_msg.h" #include "help_mp.h" #include "osdep/shmem.h" - +#include "network.h" #include "stream.h" #include "libmpdemux/demuxer.h" Modified: trunk/stream/stream_ftp.c ============================================================================== --- trunk/stream/stream_ftp.c (original) +++ trunk/stream/stream_ftp.c Sat Aug 30 00:55:39 2008 @@ -9,14 +9,9 @@ #include <fcntl.h> #include <unistd.h> #include <errno.h> -#ifndef HAVE_WINSOCK2_H -#include <sys/socket.h> -#define closesocket close -#else -#include <winsock2.h> -#endif #include "mp_msg.h" +#include "network.h" #include "stream.h" #include "help_mp.h" #include "m_option.h" Modified: trunk/stream/stream_netstream.c ============================================================================== --- trunk/stream/stream_netstream.c (original) +++ trunk/stream/stream_netstream.c Sat Aug 30 00:55:39 2008 @@ -42,15 +42,6 @@ #include <inttypes.h> #include <errno.h> -#ifndef HAVE_WINSOCK2_H -#define closesocket close -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#else -#include <winsock2.h> -#endif - #include "mp_msg.h" #include "stream.h" #include "help_mp.h" Modified: trunk/stream/stream_rtsp.c ============================================================================== --- trunk/stream/stream_rtsp.c (original) +++ trunk/stream/stream_rtsp.c Sat Aug 30 00:55:39 2008 @@ -27,18 +27,10 @@ #include <stdio.h> #include <sys/types.h> #include <ctype.h> -#include "config.h" -#ifndef HAVE_WINSOCK2_H -#include <netinet/in.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif #include <errno.h> +#include "config.h" +#include "network.h" #include "stream.h" #include "tcp.h" #include "librtsp/rtsp.h" Modified: trunk/stream/tcp.c ============================================================================== --- trunk/stream/tcp.c (original) +++ trunk/stream/tcp.c Sat Aug 30 00:55:39 2008 @@ -19,18 +19,7 @@ #include "mp_msg.h" #include "help_mp.h" - -#ifndef HAVE_WINSOCK2_H -#include <netdb.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif - +#include "network.h" #include "stream.h" #include "tcp.h" Modified: trunk/stream/udp.c ============================================================================== --- trunk/stream/udp.c (original) +++ trunk/stream/udp.c Sat Aug 30 00:55:39 2008 @@ -31,18 +31,8 @@ #include <sys/time.h> #include <ctype.h> -#ifndef HAVE_WINSOCK2_H -#include <netdb.h> -#include <netinet/in.h> -#include <sys/socket.h> -#include <arpa/inet.h> -#define closesocket close -#else -#include <winsock2.h> -#include <ws2tcpip.h> -#endif - #include "mp_msg.h" +#include "network.h" #include "url.h" #include "udp.h"

6 7

[propchange]: r27499 - svn:log
by diego 31 Aug '08

31 Aug '08

Author: diego Revision: 27499 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Change headers' guardnames consistently with FFmpeg r15120. +Change header inclusion guard names in line with FFmpeg r15120.

1 0

r27501 - trunk/gui/win32/playlist.c
by diego 31 Aug '08

31 Aug '08

Author: diego Date: Sun Aug 31 15:05:33 2008 New Revision: 27501 Log: Add necessary #include <stdlib.h> for realloc/calloc/free. patch by JonY, 10walls gmail com Modified: trunk/gui/win32/playlist.c Modified: trunk/gui/win32/playlist.c ============================================================================== --- trunk/gui/win32/playlist.c (original) +++ trunk/gui/win32/playlist.c Sun Aug 31 15:05:33 2008 @@ -23,6 +23,7 @@ #include <windows.h> #include <stdio.h> +#include <stdlib.h> #include "mp_msg.h" #include "playlist.h"

1 0