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

r27500 - trunk/libmpdemux/asf.h
by reimar 31 Aug '08

31 Aug '08

Author: reimar Date: Sun Aug 31 13:21:29 2008 New Revision: 27500 Log: Remove unused GUID_t definition that also incorrectly defined GUID_DEFINED (while actually not defining GUID, only GUID_t). Modified: trunk/libmpdemux/asf.h Modified: trunk/libmpdemux/asf.h ============================================================================== --- trunk/libmpdemux/asf.h (original) +++ trunk/libmpdemux/asf.h Sun Aug 31 13:21:29 2008 @@ -7,20 +7,6 @@ #include "mpbswap.h" /////////////////////// -// MS GUID definition -/////////////////////// -#ifndef GUID_DEFINED -#define GUID_DEFINED -// Size of GUID is 16 bytes! -typedef struct __attribute__((packed)) { - uint32_t Data1; // 4 bytes - uint16_t Data2; // 2 bytes - uint16_t Data3; // 2 bytes - uint8_t Data4[8]; // 8 bytes -} GUID_t; -#endif - -/////////////////////// // ASF Object Header /////////////////////// typedef struct __attribute__((packed)) {

1 0

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

31 Aug '08

Author: stefano Revision: 27499 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Change headers' guardnames consistently with r15120. +Change headers' guardnames consistently with FFmpeg r15120.

1 0

r27499 - in trunk/libswscale: rgb2rgb.h swscale.h swscale_internal.h
by stefano 31 Aug '08

31 Aug '08

Author: stefano Date: Sun Aug 31 09:42:11 2008 New Revision: 27499 Log: Change headers' guardnames consistently with r15120. Modified: trunk/libswscale/rgb2rgb.h trunk/libswscale/swscale.h trunk/libswscale/swscale_internal.h Modified: trunk/libswscale/rgb2rgb.h ============================================================================== --- trunk/libswscale/rgb2rgb.h (original) +++ trunk/libswscale/rgb2rgb.h Sun Aug 31 09:42:11 2008 @@ -23,8 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RGB2RGB_H -#define FFMPEG_RGB2RGB_H +#ifndef SWSCALE_RGB2RGB_H +#define SWSCALE_RGB2RGB_H #include <inttypes.h> @@ -139,4 +139,4 @@ extern void (*yvu9_to_yuy2)(const uint8_ void sws_rgb2rgb_init(int flags); -#endif /* FFMPEG_RGB2RGB_H */ +#endif /* SWSCALE_RGB2RGB_H */ Modified: trunk/libswscale/swscale.h ============================================================================== --- trunk/libswscale/swscale.h (original) +++ trunk/libswscale/swscale.h Sun Aug 31 09:42:11 2008 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SWSCALE_H -#define FFMPEG_SWSCALE_H +#ifndef SWSCALE_SWSCALE_H +#define SWSCALE_SWSCALE_H /** * @file swscale.h @@ -148,4 +148,4 @@ struct SwsContext *sws_getCachedContext( int dstW, int dstH, int dstFormat, int flags, SwsFilter *srcFilter, SwsFilter *dstFilter, double *param); -#endif /* FFMPEG_SWSCALE_H */ +#endif /* SWSCALE_SWSCALE_H */ Modified: trunk/libswscale/swscale_internal.h ============================================================================== --- trunk/libswscale/swscale_internal.h (original) +++ trunk/libswscale/swscale_internal.h Sun Aug 31 09:42:11 2008 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SWSCALE_INTERNAL_H -#define FFMPEG_SWSCALE_INTERNAL_H +#ifndef SWSCALE_SWSCALE_INTERNAL_H +#define SWSCALE_SWSCALE_INTERNAL_H #include "config.h" @@ -280,4 +280,4 @@ extern const DECLARE_ALIGNED(8, uint64_t extern const AVClass sws_context_class; -#endif /* FFMPEG_SWSCALE_INTERNAL_H */ +#endif /* SWSCALE_SWSCALE_INTERNAL_H */

1 0

r23727 - trunk/libdvdcss/libdvdcss.c
by reimar 30 Aug '08

30 Aug '08

Author: reimar Date: Sat Jul 7 00:07:35 2007 New Revision: 23727 Log: Fix CSS format strings, they could print more than two digits for "negative" numbers. Modified: trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Sat Jul 7 00:07:35 2007 @@ -472,7 +472,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( { char psz_tmp[16 + 1]; sprintf( psz_tmp, - "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", + "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"", psz_serial[0], psz_serial[1], psz_serial[2], psz_serial[3], psz_serial[4], psz_serial[5], psz_serial[6], psz_serial[7] ); @@ -488,7 +488,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( psz_key[0] = '-'; for( i = 0; i < KEY_SIZE; i++ ) { - sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] ); + sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] ); } psz_key[1 + KEY_SIZE * 2] = '\0'; }

4 12

r27474 - in trunk: Copyright libdvdcss/css.c libdvdcss/css.h libdvdcss/csstables.h libdvdcss/device.c libdvdcss/device.h libdvdcss/dvdcss/dvdcss.h libdvdcss/ioctl.c libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h
by diego 30 Aug '08

30 Aug '08

Author: diego Date: Thu Aug 21 15:40:16 2008 New Revision: 27474 Log: Sync libdvdcss with upstream version r212. Modified: trunk/Copyright trunk/libdvdcss/css.c trunk/libdvdcss/css.h trunk/libdvdcss/csstables.h trunk/libdvdcss/device.c trunk/libdvdcss/device.h trunk/libdvdcss/dvdcss/dvdcss.h trunk/libdvdcss/ioctl.c trunk/libdvdcss/libdvdcss.c trunk/libdvdcss/libdvdcss.h Modified: trunk/Copyright ============================================================================== --- trunk/Copyright (original) +++ trunk/Copyright Thu Aug 21 15:40:16 2008 @@ -42,7 +42,7 @@ Copyright: 1999-2000 Aaron Holtzman <ah License: GNU General Public License Name: libdvdcss -Version: Subversion r208 (post 1.2.9 release) +Version: Subversion r212 (post 1.2.9 release) Homepage: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss Copyright: 1998-2006 VideoLAN Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Thu Aug 21 15:40:16 2008 @@ -4,8 +4,8 @@ * Copyright (C) 1999-2003 VideoLAN * $Id$ * - * Authors: St�phane Borel <stef(a)via.ecp.fr> - * H�kan Hjort <d95hjort(a)dtek.chalmers.se> + * Authors: Stéphane Borel <stef(a)via.ecp.fr> + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * * based on: * - css-auth by Derek Fawcus <derek(a)spider.com> @@ -325,6 +325,7 @@ int _dvdcss_disckey( dvdcss_t dvdcss ) "cracking title keys instead" ); /* Fallback, but not to DISC as the disc key might be faulty */ + memset( p_disc_key, 0, KEY_SIZE ); dvdcss->i_method = DVDCSS_METHOD_TITLE; break; Modified: trunk/libdvdcss/css.h ============================================================================== --- trunk/libdvdcss/css.h (original) +++ trunk/libdvdcss/css.h Thu Aug 21 15:40:16 2008 @@ -4,7 +4,7 @@ * Copyright (C) 1999-2001 VideoLAN * $Id$ * - * Author: St�phane Borel <stef(a)via.ecp.fr> + * Author: Stéphane Borel <stef(a)via.ecp.fr> * * based on: * - css-auth by Derek Fawcus <derek(a)spider.com> Modified: trunk/libdvdcss/csstables.h ============================================================================== --- trunk/libdvdcss/csstables.h (original) +++ trunk/libdvdcss/csstables.h Thu Aug 21 15:40:16 2008 @@ -4,7 +4,7 @@ * Copyright (C) 1999-2001 VideoLAN * $Id$ * - * Author: St�phane Borel <stef(a)via.ecp.fr> + * Author: Stéphane Borel <stef(a)via.ecp.fr> * * based on: * - css-auth by Derek Fawcus <derek(a)spider.com> Modified: trunk/libdvdcss/device.c ============================================================================== --- trunk/libdvdcss/device.c (original) +++ trunk/libdvdcss/device.c Thu Aug 21 15:40:16 2008 @@ -4,9 +4,9 @@ * Copyright (C) 1998-2006 VideoLAN * $Id$ * - * Authors: St�phane Borel <stef(a)via.ecp.fr> + * Authors: Stéphane Borel <stef(a)via.ecp.fr> * Sam Hocevar <sam(a)zoy.org> - * H�kan Hjort <d95hjort(a)dtek.chalmers.se> + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libdvdcss/device.h ============================================================================== --- trunk/libdvdcss/device.h (original) +++ trunk/libdvdcss/device.h Thu Aug 21 15:40:16 2008 @@ -4,9 +4,9 @@ * Copyright (C) 1998-2002 VideoLAN * $Id$ * - * Authors: St�phane Borel <stef(a)via.ecp.fr> + * Authors: Stéphane Borel <stef(a)via.ecp.fr> * Samuel Hocevar <sam(a)zoy.org> - * H�kan Hjort <d95hjort(a)dtek.chalmers.se> + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libdvdcss/dvdcss/dvdcss.h ============================================================================== --- trunk/libdvdcss/dvdcss/dvdcss.h (original) +++ trunk/libdvdcss/dvdcss/dvdcss.h Thu Aug 21 15:40:16 2008 @@ -1,6 +1,6 @@ /** * \file dvdcss.h - * \author St�phane Borel <stef(a)via.ecp.fr> + * \author Stéphane Borel <stef(a)via.ecp.fr> * \author Samuel Hocevar <sam(a)zoy.org> * \brief The \e libdvdcss public header. * @@ -88,6 +88,8 @@ LIBDVDCSS_EXPORT int dvdcss_readv ( int i_flags ); LIBDVDCSS_EXPORT char * dvdcss_error ( dvdcss_t ); +LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t ); + /* * Deprecated stuff. Modified: trunk/libdvdcss/ioctl.c ============================================================================== --- trunk/libdvdcss/ioctl.c (original) +++ trunk/libdvdcss/ioctl.c Thu Aug 21 15:40:16 2008 @@ -7,9 +7,9 @@ * Authors: Markus Kuespert <ltlBeBoy(a)beosmail.com> * Samuel Hocevar <sam(a)zoy.org> * Jon Lech Johansen <jon-vl(a)nanocrew.net> - * H�kan Hjort <d95hjort(a)dtek.chalmers.se> + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * Eugenio Jarosiewicz <ej0(a)cise.ufl.edu> - * David Sieb�rger <drs-videolan(a)rucus.ru.ac.za> + * David Siebörger <drs-videolan(a)rucus.ru.ac.za> * Alex Strelnikov <lelik(a)os2.ru> * Gildas Bazin <gbazin(a)netcourrier.com> * Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Thu Aug 21 15:40:16 2008 @@ -1,8 +1,8 @@ /* libdvdcss.c: DVD reading library. * - * Authors: St�phane Borel <stef(a)via.ecp.fr> + * Authors: Stéphane Borel <stef(a)via.ecp.fr> * Samuel Hocevar <sam(a)zoy.org> - * H�kan Hjort <d95hjort(a)dtek.chalmers.se> + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * * Copyright (C) 1998-2002 VideoLAN * $Id$ @@ -375,6 +375,10 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( "could not get disc key" ); } } + else + { + memset( dvdcss->css.p_disc_key, 0, KEY_SIZE ); + } /* If the cache is enabled, write the cache directory tag */ if( psz_cache ) @@ -793,3 +797,15 @@ LIBDVDCSS_EXPORT int dvdcss_title ( dvdc return _dvdcss_title( dvdcss, i_block ); } +/** + * \brief Return 1 if the DVD is scrambled, 0 otherwise. + * + * \param dvdcss a \e libdvdcss instance. + * \return 1 if the DVD is scrambled, 0 otherwise. + * + * This function returns whether the DVD is scrambled. + */ +LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss ) +{ + return dvdcss->b_scrambled; +} Modified: trunk/libdvdcss/libdvdcss.h ============================================================================== --- trunk/libdvdcss/libdvdcss.h (original) +++ trunk/libdvdcss/libdvdcss.h Thu Aug 21 15:40:16 2008 @@ -4,7 +4,7 @@ * Copyright (C) 1998-2001 VideoLAN * $Id$ * - * Authors: St�phane Borel <stef(a)via.ecp.fr> + * Authors: Stéphane Borel <stef(a)via.ecp.fr> * Samuel Hocevar <sam(a)zoy.org> * * This program is free software; you can redistribute it and/or modify

4 5

r27498 - in trunk: Copyright Makefile configure dvdread libdvdread libdvdread/cmd_print.h libdvdread/ifo_print.h libdvdread/ifo_read.h libdvdread/ifo_types.h libdvdread/nav_print.h libdvdread/nav_read.h libdvdread/nav_types.h stream/stream_dvd.h stream/stream_dvd_common.c stream/stream_dvd_common.h
by rathann 30 Aug '08

30 Aug '08

Author: rathann Date: Sat Aug 30 14:22:21 2008 New Revision: 27498 Log: Rename internal libdvdread fork from dvdread to libdvdread to avoid clashing with external libdvdread. (Sync with libdvdread r1122) Added: trunk/libdvdread/ - copied from r27490, /trunk/dvdread/ Removed: trunk/dvdread/ Modified: trunk/Copyright trunk/Makefile trunk/configure trunk/libdvdread/cmd_print.h trunk/libdvdread/ifo_print.h trunk/libdvdread/ifo_read.h trunk/libdvdread/ifo_types.h trunk/libdvdread/nav_print.h trunk/libdvdread/nav_read.h trunk/libdvdread/nav_types.h trunk/stream/stream_dvd.h trunk/stream/stream_dvd_common.c trunk/stream/stream_dvd_common.h Modified: trunk/Copyright ============================================================================== --- trunk/Copyright (original) +++ trunk/Copyright Sat Aug 30 14:22:21 2008 @@ -51,7 +51,7 @@ License: GNU General Public License Name: libdvdread Version: 0.9.7 + patches Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml -Directory: dvdread +Directory: libdvdread Copyright: 1998, 1999 Eric Smith <eric(a)brouhaha.com> 1999 Christian Wolff for convergence integrated media 2000-2001 Billy Biggs <vektor(a)dumbterm.net>, Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Sat Aug 30 14:22:21 2008 @@ -236,15 +236,15 @@ SRCS_COMMON-$(DVBIN) += SRCS_COMMON-$(DVDNAV) += stream/stream_dvdnav.c SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ stream/stream_dvd_common.c -SRCS_COMMON-$(DVDREAD_INTERNAL) += dvdread/cmd_print.c \ - dvdread/dvd_input.c \ - dvdread/dvd_reader.c \ - dvdread/dvd_udf.c \ - dvdread/ifo_print.c \ - dvdread/ifo_read.c \ - dvdread/md5.c \ - dvdread/nav_print.c \ - dvdread/nav_read.c \ +SRCS_COMMON-$(DVDREAD_INTERNAL) += libdvdread/cmd_print.c \ + libdvdread/dvd_input.c \ + libdvdread/dvd_reader.c \ + libdvdread/dvd_udf.c \ + libdvdread/ifo_print.c \ + libdvdread/ifo_read.c \ + libdvdread/md5.c \ + libdvdread/nav_print.c \ + libdvdread/nav_read.c \ SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c SRCS_COMMON-$(FAAD_INTERNAL) += libfaad2/bits.c \ @@ -655,7 +655,6 @@ INSTALL_TARGETS-$(MENCODER) += install-m INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man DIRS = . \ - dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -679,6 +678,7 @@ DIRS = . \ libavformat \ libavutil \ libdvdcss \ + libdvdread \ libfaad2 \ libmenu \ libmpcodecs \ @@ -783,8 +783,8 @@ codec-cfg.d: codecs.conf.h mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h $(DEPS): help_mp.h -dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS) +libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER) Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Sat Aug 30 14:22:21 2008 @@ -5475,10 +5475,10 @@ elif test "$_dvdread" = auto ; then if test "$_dl" = yes; then cat > $TMPC << EOF #include <inttypes.h> -#include <libdvdread/dvd_reader.h> -#include <libdvdread/ifo_types.h> -#include <libdvdread/ifo_read.h> -#include <libdvdread/nav_read.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/ifo_types.h> +#include <dvdread/ifo_read.h> +#include <dvdread/nav_read.h> int main(void) { return 0; } EOF fi Modified: trunk/libdvdread/cmd_print.h ============================================================================== --- /trunk/dvdread/cmd_print.h (original) +++ trunk/libdvdread/cmd_print.h Sat Aug 30 14:22:21 2008 @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/ifo_types.h> +#include <libdvdread/ifo_types.h> /** * Pretty printing of the DVD commands (vm instructions). Modified: trunk/libdvdread/ifo_print.h ============================================================================== --- /trunk/dvdread/ifo_print.h (original) +++ trunk/libdvdread/ifo_print.h Sat Aug 30 14:22:21 2008 @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/ifo_types.h> -#include <dvdread/dvd_reader.h> +#include <libdvdread/ifo_types.h> +#include <libdvdread/dvd_reader.h> #ifdef __cplusplus extern "C" { Modified: trunk/libdvdread/ifo_read.h ============================================================================== --- /trunk/dvdread/ifo_read.h (original) +++ trunk/libdvdread/ifo_read.h Sat Aug 30 14:22:21 2008 @@ -21,8 +21,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/ifo_types.h> -#include <dvdread/dvd_reader.h> +#include <libdvdread/ifo_types.h> +#include <libdvdread/dvd_reader.h> #ifdef __cplusplus extern "C" { Modified: trunk/libdvdread/ifo_types.h ============================================================================== --- /trunk/dvdread/ifo_types.h (original) +++ trunk/libdvdread/ifo_types.h Sat Aug 30 14:22:21 2008 @@ -25,7 +25,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/dvd_reader.h> +#include <libdvdread/dvd_reader.h> #if defined(__BEOS__) #if !defined(_INTTYPES_H_) && !defined(_INTTYPES_H) && !defined(_STDINT_H_) && !defined(_STDINT_H) Modified: trunk/libdvdread/nav_print.h ============================================================================== --- /trunk/dvdread/nav_print.h (original) +++ trunk/libdvdread/nav_print.h Sat Aug 30 14:22:21 2008 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/nav_types.h> +#include <libdvdread/nav_types.h> /** * Pretty printing of the NAV packets, PCI and DSI structs. Modified: trunk/libdvdread/nav_read.h ============================================================================== --- /trunk/dvdread/nav_read.h (original) +++ trunk/libdvdread/nav_read.h Sat Aug 30 14:22:21 2008 @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <dvdread/nav_types.h> +#include <libdvdread/nav_types.h> /** * Parsing of NAV data, PCI and DSI parts. Modified: trunk/libdvdread/nav_types.h ============================================================================== --- /trunk/dvdread/nav_types.h (original) +++ trunk/libdvdread/nav_types.h Sat Aug 30 14:22:21 2008 @@ -30,7 +30,7 @@ * USA */ -#include <dvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */ +#include <libdvdread/ifo_types.h> /* only dvd_time_t, vm_cmd_t and user_ops_t */ /* If it's ever removed add a uintX_t test. */ #undef ATTRIBUTE_PACKED Modified: trunk/stream/stream_dvd.h ============================================================================== --- trunk/stream/stream_dvd.h (original) +++ trunk/stream/stream_dvd.h Sat Aug 30 14:22:21 2008 @@ -4,15 +4,15 @@ #include "config.h" #include <stdint.h> #ifdef CONFIG_DVDREAD_INTERNAL -#include "dvdread/dvd_reader.h" -#include "dvdread/ifo_types.h" -#include "dvdread/ifo_read.h" -#include "dvdread/nav_read.h" +#include "libdvdread/dvd_reader.h" +#include "libdvdread/ifo_types.h" +#include "libdvdread/ifo_read.h" +#include "libdvdread/nav_read.h" #else -#include <libdvdread/dvd_reader.h> -#include <libdvdread/ifo_types.h> -#include <libdvdread/ifo_read.h> -#include <libdvdread/nav_read.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/ifo_types.h> +#include <dvdread/ifo_read.h> +#include <dvdread/nav_read.h> #endif #include "stream.h" Modified: trunk/stream/stream_dvd_common.c ============================================================================== --- trunk/stream/stream_dvd_common.c (original) +++ trunk/stream/stream_dvd_common.c Sat Aug 30 14:22:21 2008 @@ -1,9 +1,9 @@ #include "config.h" #include <inttypes.h> #ifdef CONFIG_DVDREAD_INTERNAL -#include <dvdread/ifo_types.h> +#include "libdvdread/ifo_types.h" #else -#include <libdvdread/ifo_types.h> +#include <dvdread/ifo_types.h> #endif #include "stream_dvd_common.h" Modified: trunk/stream/stream_dvd_common.h ============================================================================== --- trunk/stream/stream_dvd_common.h (original) +++ trunk/stream/stream_dvd_common.h Sat Aug 30 14:22:21 2008 @@ -4,9 +4,9 @@ #include "config.h" #include <inttypes.h> #ifdef CONFIG_DVDREAD_INTERNAL -#include <dvdread/ifo_types.h> +#include "libdvdread/ifo_types.h" #else -#include <libdvdread/ifo_types.h> +#include <dvdread/ifo_types.h> #endif int mp_dvdtimetomsec(dvd_time_t *dt);

1 0

r27497 - trunk/stream/stream_dvd.c
by reimar 30 Aug '08

30 Aug '08

Author: reimar Date: Sat Aug 30 13:21:11 2008 New Revision: 27497 Log: Print DVD volume ID with -identify. Modified: trunk/stream/stream_dvd.c Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c (original) +++ trunk/stream/stream_dvd.c Sat Aug 30 13:21:11 2008 @@ -860,6 +860,7 @@ static int open_s(stream_t *stream,int m } if (mp_msg_test(MSGT_IDENTIFY, MSGL_V)) { + char volid[32]; unsigned char discid [16]; ///< disk ID, a 128 bit MD5 sum int vts_no; ///< video title set number for (vts_no = 1; vts_no <= vmg_file->vts_atrt->nr_of_vtss; vts_no++) @@ -872,6 +873,8 @@ static int open_s(stream_t *stream,int m mp_msg(MSGT_IDENTIFY, MSGL_V, "%02X", discid[i]); mp_msg(MSGT_IDENTIFY, MSGL_V, "\n"); } + if (DVDUDFVolumeInfo(dvd, volid, sizeof(volid), NULL, 0) >= 0) + mp_msg(MSGT_IDENTIFY, MSGL_V, "ID_DVD_VOLUME_ID=%s\n", volid); } /** * Make sure our title number is valid.

1 0

r27495 - in trunk: gui/mplayer/gtk/mb.c gui/mplayer/gtk/menu.c stream/librtsp/rtsp_rtp.c stream/librtsp/rtsp_session.c stream/realrtsp/real.c stream/realrtsp/real.h stream/realrtsp/sdpplin.c stream/realrtsp/sdpplin.h
by diego 29 Aug '08

29 Aug '08

Author: diego Date: Sat Aug 30 00:29:27 2008 New Revision: 27495 Log: consistency cosmetics: Avoid using .. in #include paths. Modified: trunk/gui/mplayer/gtk/mb.c trunk/gui/mplayer/gtk/menu.c trunk/stream/librtsp/rtsp_rtp.c trunk/stream/librtsp/rtsp_session.c trunk/stream/realrtsp/real.c trunk/stream/realrtsp/real.h trunk/stream/realrtsp/sdpplin.c trunk/stream/realrtsp/sdpplin.h Modified: trunk/gui/mplayer/gtk/mb.c ============================================================================== --- trunk/gui/mplayer/gtk/mb.c (original) +++ trunk/gui/mplayer/gtk/mb.c Sat Aug 30 00:29:27 2008 @@ -20,8 +20,8 @@ #include "gui/app.h" #include "help_mp.h" -#include "../pixmaps/error.xpm" -#include "../pixmaps/warning.xpm" +#include "gui/mplayer/pixmaps/error.xpm" +#include "gui/mplayer/pixmaps/warning.xpm" #include "gui/mplayer/widgets.h" #include "mb.h" Modified: trunk/gui/mplayer/gtk/menu.c ============================================================================== --- trunk/gui/mplayer/gtk/menu.c (original) +++ trunk/gui/mplayer/gtk/menu.c Sat Aug 30 00:29:27 2008 @@ -34,47 +34,47 @@ #include "libmpdemux/demuxer.h" #include "libmpdemux/stheader.h" -#include "../pixmaps/ab.xpm" -#include "../pixmaps/half.xpm" -#include "../pixmaps/normal.xpm" -#include "../pixmaps/double.xpm" -#include "../pixmaps/fs.xpm" -#include "../pixmaps/exit.xpm" -#include "../pixmaps/prefs.xpm" -#include "../pixmaps/eq.xpm" -#include "../pixmaps/pl.xpm" -#include "../pixmaps/skin.xpm" -#include "../pixmaps/sound.xpm" -#include "../pixmaps/open.xpm" -#include "../pixmaps/play.xpm" -#include "../pixmaps/stop2.xpm" -#include "../pixmaps/pause.xpm" -#include "../pixmaps/prev.xpm" -#include "../pixmaps/next.xpm" -#include "../pixmaps/aspect.xpm" -#include "../pixmaps/a11.xpm" -#include "../pixmaps/a169.xpm" -#include "../pixmaps/a235.xpm" -#include "../pixmaps/a43.xpm" -#include "../pixmaps/file2.xpm" -#include "../pixmaps/url.xpm" -#include "../pixmaps/sub.xpm" -#include "../pixmaps/delsub.xpm" -#include "../pixmaps/empty.xpm" -#include "../pixmaps/loadeaf.xpm" -#include "../pixmaps/title.xpm" +#include "gui/mplayer/pixmaps/ab.xpm" +#include "gui/mplayer/pixmaps/half.xpm" +#include "gui/mplayer/pixmaps/normal.xpm" +#include "gui/mplayer/pixmaps/double.xpm" +#include "gui/mplayer/pixmaps/fs.xpm" +#include "gui/mplayer/pixmaps/exit.xpm" +#include "gui/mplayer/pixmaps/prefs.xpm" +#include "gui/mplayer/pixmaps/eq.xpm" +#include "gui/mplayer/pixmaps/pl.xpm" +#include "gui/mplayer/pixmaps/skin.xpm" +#include "gui/mplayer/pixmaps/sound.xpm" +#include "gui/mplayer/pixmaps/open.xpm" +#include "gui/mplayer/pixmaps/play.xpm" +#include "gui/mplayer/pixmaps/stop2.xpm" +#include "gui/mplayer/pixmaps/pause.xpm" +#include "gui/mplayer/pixmaps/prev.xpm" +#include "gui/mplayer/pixmaps/next.xpm" +#include "gui/mplayer/pixmaps/aspect.xpm" +#include "gui/mplayer/pixmaps/a11.xpm" +#include "gui/mplayer/pixmaps/a169.xpm" +#include "gui/mplayer/pixmaps/a235.xpm" +#include "gui/mplayer/pixmaps/a43.xpm" +#include "gui/mplayer/pixmaps/file2.xpm" +#include "gui/mplayer/pixmaps/url.xpm" +#include "gui/mplayer/pixmaps/sub.xpm" +#include "gui/mplayer/pixmaps/delsub.xpm" +#include "gui/mplayer/pixmaps/empty.xpm" +#include "gui/mplayer/pixmaps/loadeaf.xpm" +#include "gui/mplayer/pixmaps/title.xpm" #ifdef CONFIG_DVDREAD -#include "../pixmaps/dvd.xpm" -#include "../pixmaps/playdvd.xpm" -#include "../pixmaps/chapter.xpm" -#include "../pixmaps/dolby.xpm" -#include "../pixmaps/tongue.xpm" -#include "../pixmaps/tonguebla.xpm" -#include "../pixmaps/empty1px.xpm" +#include "gui/mplayer/pixmaps/dvd.xpm" +#include "gui/mplayer/pixmaps/playdvd.xpm" +#include "gui/mplayer/pixmaps/chapter.xpm" +#include "gui/mplayer/pixmaps/dolby.xpm" +#include "gui/mplayer/pixmaps/tongue.xpm" +#include "gui/mplayer/pixmaps/tonguebla.xpm" +#include "gui/mplayer/pixmaps/empty1px.xpm" #endif #ifdef CONFIG_VCD -#include "../pixmaps/vcd.xpm" -#include "../pixmaps/playvcd.xpm" +#include "gui/mplayer/pixmaps/vcd.xpm" +#include "gui/mplayer/pixmaps/playvcd.xpm" #endif void ActivateMenuItem( int Item ) Modified: trunk/stream/librtsp/rtsp_rtp.c ============================================================================== --- trunk/stream/librtsp/rtsp_rtp.c (original) +++ trunk/stream/librtsp/rtsp_rtp.c Sat Aug 30 00:29:27 2008 @@ -42,8 +42,8 @@ #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "../freesdp/common.h" -#include "../freesdp/parser.h" +#include "stream/freesdp/common.h" +#include "stream/freesdp/parser.h" #define RTSP_DEFAULT_PORT 31336 #define MAX_LENGTH 256 Modified: trunk/stream/librtsp/rtsp_session.c ============================================================================== --- trunk/stream/librtsp/rtsp_session.c (original) +++ trunk/stream/librtsp/rtsp_session.c Sat Aug 30 00:29:27 2008 @@ -48,15 +48,15 @@ #include <inttypes.h> #include "mp_msg.h" -#include "../url.h" -#include "../rtp.h" #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "../realrtsp/real.h" -#include "../realrtsp/rmff.h" -#include "../realrtsp/asmrp.h" -#include "../realrtsp/xbuffer.h" +#include "stream/url.h" +#include "stream/rtp.h" +#include "stream/realrtsp/real.h" +#include "stream/realrtsp/rmff.h" +#include "stream/realrtsp/asmrp.h" +#include "stream/realrtsp/xbuffer.h" /* #define LOG Modified: trunk/stream/realrtsp/real.c ============================================================================== --- trunk/stream/realrtsp/real.c (original) +++ trunk/stream/realrtsp/real.c Sat Aug 30 00:29:27 2008 @@ -38,7 +38,7 @@ #include "xbuffer.h" #include "libavutil/md5.h" #include "libavutil/intreadwrite.h" -#include "../http.h" +#include "stream/http.h" #include "mp_msg.h" /* Modified: trunk/stream/realrtsp/real.h ============================================================================== --- trunk/stream/realrtsp/real.h (original) +++ trunk/stream/realrtsp/real.h Sat Aug 30 00:29:27 2008 @@ -31,7 +31,7 @@ #define MPLAYER_REAL_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" #define HEADER_SIZE 4096 Modified: trunk/stream/realrtsp/sdpplin.c ============================================================================== --- trunk/stream/realrtsp/sdpplin.c (original) +++ trunk/stream/realrtsp/sdpplin.c Sat Aug 30 00:29:27 2008 @@ -27,7 +27,7 @@ */ #include "config.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" #include "sdpplin.h" #include "xbuffer.h" #include "mp_msg.h" Modified: trunk/stream/realrtsp/sdpplin.h ============================================================================== --- trunk/stream/realrtsp/sdpplin.h (original) +++ trunk/stream/realrtsp/sdpplin.h Sat Aug 30 00:29:27 2008 @@ -30,7 +30,7 @@ #define MPLAYER_SDPPLIN_H #include "rmff.h" -#include "../librtsp/rtsp.h" +#include "stream/librtsp/rtsp.h" typedef struct {

1 0

r27494 - in trunk: Changelog Copyright libdvdcss/common.h libdvdcss/css.c libdvdcss/device.h libdvdcss/dvdcss/dvdcss.h libdvdcss/error.c libdvdcss/ioctl.c libdvdcss/ioctl.h libdvdcss/libdvdcss.c libdvdcss/libdvdcss.h
by diego 29 Aug '08

29 Aug '08

Author: diego Date: Fri Aug 29 22:22:36 2008 New Revision: 27494 Log: Sync libdvdcss with upstream version 1.2.10. Modified: trunk/Changelog trunk/Copyright trunk/libdvdcss/common.h trunk/libdvdcss/css.c trunk/libdvdcss/device.h trunk/libdvdcss/dvdcss/dvdcss.h trunk/libdvdcss/error.c trunk/libdvdcss/ioctl.c trunk/libdvdcss/ioctl.h trunk/libdvdcss/libdvdcss.c trunk/libdvdcss/libdvdcss.h Modified: trunk/Changelog ============================================================================== --- trunk/Changelog (original) +++ trunk/Changelog Fri Aug 29 22:22:36 2008 @@ -81,6 +81,7 @@ MPlayer (1.0) * support for DOS-style file:///x:/path paths * some new slave commands (check DOCS/tech/slave.txt) * misc fixes to libass + * libdvdcss updated to 1.2.10, now same as upstream version Ports: * small crash with vo_macosx fixed Modified: trunk/Copyright ============================================================================== --- trunk/Copyright (original) +++ trunk/Copyright Fri Aug 29 22:22:36 2008 @@ -42,10 +42,10 @@ Copyright: 1999-2000 Aaron Holtzman <ah License: GNU General Public License Name: libdvdcss -Version: Subversion r212 (post 1.2.9 release) +Version: 1.2.10 Homepage: http://developers.videolan.org/libdvdcss/ Directory: libdvdcss -Copyright: 1998-2006 VideoLAN +Copyright: 1998-2008 VideoLAN License: GNU General Public License Name: libdvdread Modified: trunk/libdvdcss/common.h ============================================================================== --- trunk/libdvdcss/common.h (original) +++ trunk/libdvdcss/common.h Fri Aug 29 22:22:36 2008 @@ -5,7 +5,7 @@ * Copyright (C) 1998, 1999, 2000 VideoLAN * $Id$ * - * Authors: Samuel Hocevar <sam(a)via.ecp.fr> + * Authors: Sam Hocevar <sam(a)via.ecp.fr> * Vincent Seguin <seguin(a)via.ecp.fr> * Gildas Bazin <gbazin(a)netcourrier.com> * Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c (original) +++ trunk/libdvdcss/css.c Fri Aug 29 22:22:36 2008 @@ -1,7 +1,7 @@ /***************************************************************************** * css.c: Functions for DVD authentication and descrambling ***************************************************************************** - * Copyright (C) 1999-2003 VideoLAN + * Copyright (C) 1999-2008 VideoLAN * $Id$ * * Authors: Stéphane Borel <stef(a)via.ecp.fr> Modified: trunk/libdvdcss/device.h ============================================================================== --- trunk/libdvdcss/device.h (original) +++ trunk/libdvdcss/device.h Fri Aug 29 22:22:36 2008 @@ -5,7 +5,7 @@ * $Id$ * * Authors: Stéphane Borel <stef(a)via.ecp.fr> - * Samuel Hocevar <sam(a)zoy.org> + * Sam Hocevar <sam(a)zoy.org> * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * * This program is free software; you can redistribute it and/or modify Modified: trunk/libdvdcss/dvdcss/dvdcss.h ============================================================================== --- trunk/libdvdcss/dvdcss/dvdcss.h (original) +++ trunk/libdvdcss/dvdcss/dvdcss.h Fri Aug 29 22:22:36 2008 @@ -1,7 +1,7 @@ /** * \file dvdcss.h * \author Stéphane Borel <stef(a)via.ecp.fr> - * \author Samuel Hocevar <sam(a)zoy.org> + * \author Sam Hocevar <sam(a)zoy.org> * \brief The \e libdvdcss public header. * * This header contains the public types and functions that applications @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 1998-2002 VideoLAN + * Copyright (C) 1998-2008 VideoLAN * $Id$ * * This program is free software; you can redistribute it and/or modify Modified: trunk/libdvdcss/error.c ============================================================================== --- trunk/libdvdcss/error.c (original) +++ trunk/libdvdcss/error.c Fri Aug 29 22:22:36 2008 @@ -4,7 +4,7 @@ * Copyright (C) 1998-2002 VideoLAN * $Id$ * - * Author: Samuel Hocevar <sam(a)zoy.org> + * Author: Sam Hocevar <sam(a)zoy.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libdvdcss/ioctl.c ============================================================================== --- trunk/libdvdcss/ioctl.c (original) +++ trunk/libdvdcss/ioctl.c Fri Aug 29 22:22:36 2008 @@ -5,7 +5,7 @@ * $Id$ * * Authors: Markus Kuespert <ltlBeBoy(a)beosmail.com> - * Samuel Hocevar <sam(a)zoy.org> + * Sam Hocevar <sam(a)zoy.org> * Jon Lech Johansen <jon-vl(a)nanocrew.net> * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * Eugenio Jarosiewicz <ej0(a)cise.ufl.edu> Modified: trunk/libdvdcss/ioctl.h ============================================================================== --- trunk/libdvdcss/ioctl.h (original) +++ trunk/libdvdcss/ioctl.h Fri Aug 29 22:22:36 2008 @@ -4,7 +4,7 @@ * Copyright (C) 1999-2001 VideoLAN * $Id$ * - * Authors: Samuel Hocevar <sam(a)zoy.org> + * Authors: Sam Hocevar <sam(a)zoy.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c (original) +++ trunk/libdvdcss/libdvdcss.c Fri Aug 29 22:22:36 2008 @@ -1,10 +1,10 @@ /* libdvdcss.c: DVD reading library. * * Authors: Stéphane Borel <stef(a)via.ecp.fr> - * Samuel Hocevar <sam(a)zoy.org> + * Sam Hocevar <sam(a)zoy.org> * Håkan Hjort <d95hjort(a)dtek.chalmers.se> * - * Copyright (C) 1998-2002 VideoLAN + * Copyright (C) 1998-2008 VideoLAN * $Id$ * * This program is free software; you can redistribute it and/or modify @@ -371,8 +371,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( if( i_ret < 0 ) { - print_debug( dvdcss, - "could not get disc key" ); + print_debug( dvdcss, "could not get disc key" ); } } else @@ -474,7 +473,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( { char psz_tmp[16 + 1]; sprintf( psz_tmp, - "%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"%.2"PRIx8"", + "%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x", psz_serial[0], psz_serial[1], psz_serial[2], psz_serial[3], psz_serial[4], psz_serial[5], psz_serial[6], psz_serial[7] ); @@ -490,7 +489,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( psz_key[0] = '-'; for( i = 0; i < KEY_SIZE; i++ ) { - sprintf( &psz_key[1+i*2], "%.2"PRIx8, dvdcss->css.p_disc_key[i] ); + sprintf( &psz_key[1+i*2], "%.2x", dvdcss->css.p_disc_key[i] ); } psz_key[1 + KEY_SIZE * 2] = '\0'; } @@ -809,3 +808,4 @@ LIBDVDCSS_EXPORT int dvdcss_is_scrambled { return dvdcss->b_scrambled; } + Modified: trunk/libdvdcss/libdvdcss.h ============================================================================== --- trunk/libdvdcss/libdvdcss.h (original) +++ trunk/libdvdcss/libdvdcss.h Fri Aug 29 22:22:36 2008 @@ -5,7 +5,7 @@ * $Id$ * * Authors: Stéphane Borel <stef(a)via.ecp.fr> - * Samuel Hocevar <sam(a)zoy.org> + * Sam Hocevar <sam(a)zoy.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by

2 1

r27493 - in trunk: TOOLS/netstream.c configure libvo/vo_bl.c stream/asf_mmst_streaming.c stream/asf_streaming.c stream/http.c stream/librtsp/rtsp.c stream/librtsp/rtsp_rtp.c stream/librtsp/rtsp_session.c stream/netstream.h stream/network.c stream/network.h stream/pnm.c stream/realrtsp/rmff.h stream/rtp.c stream/stream.c stream/stream_cddb.c stream/stream_ftp.c stream/stream_netstream.c stream/stream_rtsp.c stream/tcp.c stream/tvi_v4l2.c stream/udp.c
by diego 29 Aug '08

29 Aug '08

Author: diego Date: Fri Aug 29 22:05:08 2008 New Revision: 27493 Log: Rename HAVE_WINSOCK preprocessor condition to HAVE_WINSOCK_H. This is what it is called in FFmpeg and more consistent with other names for similar conditionals. This fixes a potential compilation failure on MinGW, as described in Bugzilla #1262. Modified: trunk/TOOLS/netstream.c trunk/configure trunk/libvo/vo_bl.c trunk/stream/asf_mmst_streaming.c trunk/stream/asf_streaming.c trunk/stream/http.c trunk/stream/librtsp/rtsp.c trunk/stream/librtsp/rtsp_rtp.c trunk/stream/librtsp/rtsp_session.c trunk/stream/netstream.h trunk/stream/network.c trunk/stream/network.h trunk/stream/pnm.c trunk/stream/realrtsp/rmff.h trunk/stream/rtp.c trunk/stream/stream.c trunk/stream/stream_cddb.c trunk/stream/stream_ftp.c trunk/stream/stream_netstream.c trunk/stream/stream_rtsp.c trunk/stream/tcp.c trunk/stream/tvi_v4l2.c trunk/stream/udp.c Modified: trunk/TOOLS/netstream.c ============================================================================== --- trunk/TOOLS/netstream.c (original) +++ trunk/TOOLS/netstream.c Fri Aug 29 22:05:08 2008 @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Fri Aug 29 22:05:08 2008 @@ -239,7 +239,7 @@ Optional features: --disable-pvr disable Video4Linux2 MPEG PVR [autodetect] --disable-rtc disable RTC (/dev/rtc) on Linux [autodetect] --disable-network disable networking [enable] - --enable-winsock2 enable winsock2 [autodetect] + --enable-winsock2_h enable winsock2_h [autodetect] --enable-smb enable Samba (SMB) input [autodetect] --enable-live enable LIVE555 Streaming Media [autodetect] --enable-nemesi enable Nemesi Streaming Media [autodetect] @@ -621,7 +621,7 @@ _tv_dshow=auto _tv_teletext=auto _pvr=auto _network=yes -_winsock2=auto +_winsock2_h=auto _smb=auto _vidix=auto _vidix_pcidb=yes @@ -1022,8 +1022,8 @@ for ac_option do --disable-fastmemcpy) _fastmemcpy=no ;; --enable-network) _network=yes ;; --disable-network) _network=no ;; - --enable-winsock2) _winsock2=yes ;; - --disable-winsock2) _winsock2=no ;; + --enable-winsock2_h) _winsock2_h=yes ;; + --disable-winsock2_h) _winsock2_h=no ;; --enable-smb) _smb=yes ;; --disable-smb) _smb=no ;; --enable-vidix) _vidix=yes ;; @@ -2802,23 +2802,23 @@ _socklib=no for _ld_tmp in "" "-lsocket -lbind" "-lsocket -ldnet" "-lsocket -lnsl" "-lnsl" "-lsocket" ; do cc_check $_ld_tmp && _ld_sock="$_ld_tmp" && _socklib=yes && break done -if test $_winsock2 = auto && ! cygwin ; then - _winsock2=no +if test $_winsock2_h = auto && ! cygwin ; then + _winsock2_h=no cat > $TMPC << EOF #include <winsock2.h> int main(void) { (void) gethostbyname(0); return 0; } EOF - cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2=yes + cc_check -lws2_32 && _ld_sock="-lws2_32" && _winsock2_h=yes fi test "$_ld_sock" && _res_comment="using $_ld_sock" echores "$_socklib" -if test $_winsock2 = yes ; then +if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" - _def_winsock2='#define HAVE_WINSOCK2 1' + _def_winsock2_h='#define HAVE_WINSOCK2_H 1' else - _def_winsock2='#undef HAVE_WINSOCK2' + _def_winsock2_h='#undef HAVE_WINSOCK2_H' fi @@ -2830,7 +2830,7 @@ cat > $TMPC << EOF #include <arpa/inet.h> int main(void) { (void) inet_pton(0, 0, 0); return 0; } EOF -if test "$_winsock2" = yes ; then +if test "$_winsock2_h" = yes ; then _res_comment="using winsock2 functions instead" echores "no" elif cc_check $_ld_sock ; then @@ -8630,7 +8630,7 @@ $_def_ftp $_def_vstream /* enable winsock2 instead of Unix functions*/ -$_def_winsock2 +$_def_winsock2_h /* define this to use inet_aton() instead of inet_pton() */ $_def_use_aton Modified: trunk/libvo/vo_bl.c ============================================================================== --- trunk/libvo/vo_bl.c (original) +++ trunk/libvo/vo_bl.c Fri Aug 29 22:05:08 2008 @@ -34,7 +34,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <netdb.h> #include <sys/socket.h> Modified: trunk/stream/asf_mmst_streaming.c ============================================================================== --- trunk/stream/asf_mmst_streaming.c (original) +++ trunk/stream/asf_mmst_streaming.c Fri Aug 29 22:05:08 2008 @@ -39,7 +39,7 @@ #include "mp_msg.h" #include "help_mp.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #else #include <winsock2.h> Modified: trunk/stream/asf_streaming.c ============================================================================== --- trunk/stream/asf_streaming.c (original) +++ trunk/stream/asf_streaming.c Fri Aug 29 22:05:08 2008 @@ -9,7 +9,7 @@ #include "mp_msg.h" #include "help_mp.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #else #include <winsock2.h> Modified: trunk/stream/http.c ============================================================================== --- trunk/stream/http.c (original) +++ trunk/stream/http.c Fri Aug 29 22:05:08 2008 @@ -11,7 +11,7 @@ #include <string.h> #include <unistd.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #else #include <winsock2.h> Modified: trunk/stream/librtsp/rtsp.c ============================================================================== --- trunk/stream/librtsp/rtsp.c (original) +++ trunk/stream/librtsp/rtsp.c Fri Aug 29 22:05:08 2008 @@ -42,7 +42,7 @@ #include <sys/time.h> #include <sys/types.h> #include <inttypes.h> -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H #include <winsock2.h> #else #include <sys/socket.h> @@ -72,7 +72,7 @@ static int write_stream(int s, const cha if (n > 0) total += n; else if (n < 0) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if ((timeout>0) && ((errno == EAGAIN) || (errno == EINPROGRESS))) { #else if ((timeout>0) && ((errno == EAGAIN) || (WSAGetLastError() == WSAEINPROGRESS))) { Modified: trunk/stream/librtsp/rtsp_rtp.c ============================================================================== --- trunk/stream/librtsp/rtsp_rtp.c (original) +++ trunk/stream/librtsp/rtsp_rtp.c Fri Aug 29 22:05:08 2008 @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -250,7 +250,7 @@ rtcp_connect (int client_port, int serve if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -296,7 +296,7 @@ rtp_connect (char *hostname, int port) if (!hostname || !strcmp (hostname, "0.0.0.0")) sin.sin_addr.s_addr = htonl (INADDR_ANY); else -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (hostname, &sin.sin_addr); #else @@ -331,7 +331,7 @@ rtp_connect (char *hostname, int port) /* datagram socket */ if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -385,7 +385,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (addr, &sin.sin_addr); #else Modified: trunk/stream/librtsp/rtsp_session.c ============================================================================== --- trunk/stream/librtsp/rtsp_session.c (original) +++ trunk/stream/librtsp/rtsp_session.c Fri Aug 29 22:05:08 2008 @@ -30,7 +30,7 @@ #include <sys/types.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <sys/socket.h> #include <netinet/in.h> Modified: trunk/stream/netstream.h ============================================================================== --- trunk/stream/netstream.h (original) +++ trunk/stream/netstream.h Fri Aug 29 22:05:08 2008 @@ -14,7 +14,7 @@ #include <stdlib.h> #include <string.h> #include <errno.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <sys/socket.h> #endif #include "mp_msg.h" Modified: trunk/stream/network.c ============================================================================== --- trunk/stream/network.c (original) +++ trunk/stream/network.c Fri Aug 29 22:05:08 2008 @@ -19,7 +19,7 @@ #include "mp_msg.h" #include "help_mp.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #else #include <winsock2.h> Modified: trunk/stream/network.h ============================================================================== --- trunk/stream/network.h (original) +++ trunk/stream/network.h Fri Aug 29 22:05:08 2008 @@ -12,7 +12,7 @@ #include <sys/types.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> Modified: trunk/stream/pnm.c ============================================================================== --- trunk/stream/pnm.c (original) +++ trunk/stream/pnm.c Fri Aug 29 22:05:08 2008 @@ -35,7 +35,7 @@ #include <stdlib.h> #include <sys/time.h> #include <inttypes.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <sys/socket.h> //#include <netinet/in.h> @@ -205,7 +205,7 @@ static int rm_write(int s, const char *b if (n > 0) total += n; else if (n < 0) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (timeout>0 && (errno == EAGAIN || errno == EINPROGRESS)) { #else if (timeout>0 && (errno == EAGAIN || WSAGetLastError() == WSAEINPROGRESS)) { Modified: trunk/stream/realrtsp/rmff.h ============================================================================== --- trunk/stream/realrtsp/rmff.h (original) +++ trunk/stream/realrtsp/rmff.h Fri Aug 29 22:05:08 2008 @@ -31,7 +31,7 @@ #include <sys/types.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> Modified: trunk/stream/rtp.c ============================================================================== --- trunk/stream/rtp.c (original) +++ trunk/stream/rtp.c Fri Aug 29 22:05:08 2008 @@ -13,7 +13,7 @@ #include <sys/types.h> #include <ctype.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c (original) +++ trunk/stream/stream.c Fri Aug 29 22:05:08 2008 @@ -14,7 +14,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #else #include <winsock2.h> @@ -410,7 +410,7 @@ stream_t* new_stream(int fd,int type){ if(s==NULL) return NULL; memset(s,0,sizeof(stream_t)); -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H { WSADATA wsdata; int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later) @@ -445,7 +445,7 @@ void free_stream(stream_t *s){ closesocket(s->fd); else close(s->fd); } -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n"); WSACleanup(); // there might be a better place for this (-> later) #endif Modified: trunk/stream/stream_cddb.c ============================================================================== --- trunk/stream/stream_cddb.c (original) +++ trunk/stream/stream_cddb.c Fri Aug 29 22:05:08 2008 @@ -27,7 +27,7 @@ #define mkdir(a,b) mkdir(a) #endif #include <windows.h> -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H #include <winsock2.h> #endif #else Modified: trunk/stream/stream_ftp.c ============================================================================== --- trunk/stream/stream_ftp.c (original) +++ trunk/stream/stream_ftp.c Fri Aug 29 22:05:08 2008 @@ -9,7 +9,7 @@ #include <fcntl.h> #include <unistd.h> #include <errno.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <sys/socket.h> #define closesocket close #else Modified: trunk/stream/stream_netstream.c ============================================================================== --- trunk/stream/stream_netstream.c (original) +++ trunk/stream/stream_netstream.c Fri Aug 29 22:05:08 2008 @@ -42,7 +42,7 @@ #include <inttypes.h> #include <errno.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #define closesocket close #include <sys/socket.h> #include <netinet/in.h> @@ -90,7 +90,7 @@ static const struct m_struct_st stream_o //// When the cache is running we need a lock as //// fill_buffer is called from another proccess static int lock_fd(int fd) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H struct flock lock; memset(&lock,0,sizeof(struct flock)); @@ -113,7 +113,7 @@ printf("FIXME? should lock here\n"); } static int unlock_fd(int fd) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H struct flock lock; memset(&lock,0,sizeof(struct flock)); Modified: trunk/stream/stream_rtsp.c ============================================================================== --- trunk/stream/stream_rtsp.c (original) +++ trunk/stream/stream_rtsp.c Fri Aug 29 22:05:08 2008 @@ -28,7 +28,7 @@ #include <sys/types.h> #include <ctype.h> #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netinet/in.h> #include <sys/socket.h> #include <arpa/inet.h> Modified: trunk/stream/tcp.c ============================================================================== --- trunk/stream/tcp.c (original) +++ trunk/stream/tcp.c Fri Aug 29 22:05:08 2008 @@ -20,7 +20,7 @@ #include "mp_msg.h" #include "help_mp.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -75,7 +75,7 @@ connect2Server_with_af(char *host, int p struct hostent *hp=NULL; char buf[255]; -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H u_long val; int to; #else @@ -91,7 +91,7 @@ connect2Server_with_af(char *host, int p } #if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO) -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H /* timeout in milliseconds */ to = 10 * 1000; #else @@ -115,7 +115,7 @@ connect2Server_with_af(char *host, int p memset(&server_address, 0, sizeof(server_address)); -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON if (inet_aton(host, our_s_addr)!=1) #else @@ -139,7 +139,7 @@ connect2Server_with_af(char *host, int p memcpy( our_s_addr, (void*)hp->h_addr_list[0], hp->h_length ); } -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H else { unsigned long addr = inet_addr(host); memcpy( our_s_addr, (void*)&addr, sizeof(addr) ); @@ -164,7 +164,7 @@ connect2Server_with_af(char *host, int p return TCP_ERROR_FATAL; } -#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2) +#if defined(HAVE_ATON) || defined(HAVE_WINSOCK2_H) strncpy( buf, inet_ntoa( *((struct in_addr*)our_s_addr) ), 255); #else inet_ntop(af, our_s_addr, buf, 255); @@ -172,14 +172,14 @@ connect2Server_with_af(char *host, int p if(verb) mp_msg(MSGT_NETWORK,MSGL_STATUS,MSGTR_MPDEMUX_NW_ConnectingToServer, host, buf , port ); // Turn the socket as non blocking so we can timeout on the connection -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK ); #else val = 1; ioctlsocket( socket_server_fd, FIONBIO, &val ); #endif if( connect( socket_server_fd, (struct sockaddr*)&server_address, server_address_size )==-1 ) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if( errno!=EINPROGRESS ) { #else if( (WSAGetLastError() != WSAEINPROGRESS) && (WSAGetLastError() != WSAEWOULDBLOCK) ) { @@ -211,7 +211,7 @@ connect2Server_with_af(char *host, int p if (ret < 0) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed); // Turn back the socket as blocking -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) & ~O_NONBLOCK ); #else val = 0; Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c (original) +++ trunk/stream/tvi_v4l2.c Fri Aug 29 22:05:08 2008 @@ -35,6 +35,7 @@ known issues: #include <sys/time.h> #include <sys/types.h> #include <unistd.h> +#include <math.h> #ifdef HAVE_SYS_SYSINFO_H #include <sys/sysinfo.h> #endif Modified: trunk/stream/udp.c ============================================================================== --- trunk/stream/udp.c (original) +++ trunk/stream/udp.c Fri Aug 29 22:05:08 2008 @@ -31,7 +31,7 @@ #include <sys/time.h> #include <ctype.h> -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -74,7 +74,7 @@ udp_open_socket (URL_t *url) if (isalpha (url->hostname[0])) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H hp = (struct hostent *) gethostbyname (url->hostname); if (!hp) { @@ -87,11 +87,11 @@ udp_open_socket (URL_t *url) (void *) hp->h_addr_list[0], hp->h_length); #else server_address.sin_addr.s_addr = htonl (INADDR_ANY); -#endif /* HAVE_WINSOCK2 */ +#endif /* HAVE_WINSOCK2_H */ } else { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (url->hostname, &server_address.sin_addr); #else @@ -99,7 +99,7 @@ udp_open_socket (URL_t *url) #endif /* HAVE_ATON */ #else server_address.sin_addr.s_addr = htonl(INADDR_ANY); -#endif /* HAVE_WINSOCK2 */ +#endif /* HAVE_WINSOCK2_H */ } server_address.sin_family = AF_INET; server_address.sin_port = htons (url->port); @@ -110,11 +110,11 @@ udp_open_socket (URL_t *url) if (bind (socket_server_fd, (struct sockaddr *) &server_address, sizeof (server_address)) == -1) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError () != WSAEINPROGRESS) -#endif /* HAVE_WINSOCK2 */ +#endif /* HAVE_WINSOCK2_H */ { mp_msg (MSGT_NETWORK, MSGL_ERR, "Failed to connect to server\n"); closesocket (socket_server_fd); @@ -122,7 +122,7 @@ udp_open_socket (URL_t *url) } } -#ifdef HAVE_WINSOCK2 +#ifdef HAVE_WINSOCK2_H if (isalpha (url->hostname[0])) { hp = (struct hostent *) gethostbyname (url->hostname); @@ -141,7 +141,7 @@ udp_open_socket (URL_t *url) unsigned int addr = inet_addr (url->hostname); memcpy ((void *) &server_address.sin_addr, (void *) &addr, sizeof (addr)); } -#endif /* HAVE_WINSOCK2 */ +#endif /* HAVE_WINSOCK2_H */ /* Increase the socket rx buffer size to maximum -- this is UDP */ rxsockbufsz = 240 * 1024;

1 0