Commit 2ebfdccd authored by Christophe Massiot's avatar Christophe Massiot

* BSD/OS VCD patch, courtesy of Steven M. Schultz <sms@TO.GD-ES.COM>

* Win32 network fix.
parent caf9e0ac
This diff is collapsed.
......@@ -686,6 +686,11 @@ then
])
fi
if test x$enable_vcd != xno -a "${SYS}" = "bsdi"
then
BUILTINS="${BUILTINS} vcd"
fi
dnl
dnl dummy plugin
dnl
......
......@@ -20,7 +20,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <linux/cdrom.h>
#if defined(HAVE_BSD_DVD_STRUCT) || defined(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H) || defined(DVD_STRUCT_IN_DVD_H)
# include <dvd.h>
#else
# include <linux/cdrom.h>
#endif
/* where the data start on a VCD sector */
#define VCD_DATA_START 24
/* size of the availablr data on a VCD sector */
......
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.151 2001/11/07 22:58:13 jlj Exp $
* $Id: input.c,v 1.152 2001/11/09 13:49:26 massiot Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -837,7 +837,7 @@ static void NetworkOpen( input_thread_t * p_input )
}
else
{
psz_broadcast = NULL;
psz_broadcast = NULL;
}
}
......@@ -913,10 +913,7 @@ static void NetworkOpen( input_thread_t * p_input )
i_mc_group = sock.sin_addr.s_addr;
#if defined( WIN32 )
if ( psz_broadcast != NULL )
{
sock.sin_addr.s_addr = INADDR_ANY;
}
sock.sin_addr.s_addr = INADDR_ANY;
#define IN_MULTICAST(a) IN_CLASSD(a)
#endif
......@@ -950,7 +947,6 @@ static void NetworkOpen( input_thread_t * p_input )
return;
}
}
#endif
/* Build socket for remote connection */
if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 )
......@@ -975,6 +971,7 @@ static void NetworkOpen( input_thread_t * p_input )
return;
}
}
#endif
p_input->stream.b_pace_control = 0;
p_input->stream.b_seekable = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment