Commit 6d7c2261 authored by Johan Bilien's avatar Johan Bilien

*** empty log message ***

parent 313043fe
......@@ -51,6 +51,7 @@ PLUGINS_DIR := a52 \
network \
qnx \
qt \
satellite \
sdl \
spudec \
text \
......@@ -130,6 +131,7 @@ PLUGINS_TARGETS := a52/a52 \
network/ipv6 \
qnx/qnx \
qt/qt \
satellite/satellite \
sdl/sdl \
spudec/spudec \
text/logger \
......
This diff is collapsed.
......@@ -832,6 +832,17 @@ then
fi
fi
dnl
dnl Satellite input module
dnl
AC_ARG_ENABLE(satellite,
[ --enable-satellite Satellite card support (default disabled)],
[ if test x$enable_satellite = xyes
then
BUILTINS="${BUILTINS} satellite"
AC_DEFINE(HAVE_SATELLITE, 1, define if compiling with satellite card support)
fi])
dnl
dnl ipv6 plugin
dnl
......
......@@ -422,6 +422,9 @@
/* Define if FreeBSD-like dvd_struct is defined. */
#undef HAVE_BSD_DVD_STRUCT
/* define if compiling with satellite card support */
#undef HAVE_SATELLITE
/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */
#undef SDL_INCLUDE_FILE
......
......@@ -4,7 +4,7 @@
* control the pace of reading.
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.62 2002/03/05 17:46:33 stef Exp $
* $Id: input_ext-intf.h,v 1.63 2002/03/21 02:27:04 jobi Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -71,7 +71,10 @@ typedef struct es_descriptor_s
* fast forward and slow motion ? */
u8 i_cat; /* stream category: video, audio,
* spu, other */
#ifdef HAVE_SATELLITE
int i_dmx_fd; /* used to store demux device
file handle */
#endif
char psz_desc[20]; /* description of ES: audio language
* for instance ; NULL if not
* available */
......@@ -315,7 +318,8 @@ typedef struct input_thread_s
#define INPUT_METHOD_MCAST 0x32 /* UDP multicast */
#define INPUT_METHOD_BCAST 0x33 /* UDP broadcast */
#define INPUT_METHOD_VLAN_BCAST 0x34 /* UDP broadcast with VLANs */
#define INPUT_METHOD_SATELLITE 0x40 /* stream is read from a */
/* satellite card */
/* Status changing methods */
#define INPUT_STATUS_END 0
......
......@@ -2,7 +2,7 @@
* input_programs.c: es_descriptor_t, pgrm_descriptor_t management
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: input_programs.c,v 1.75 2002/03/19 23:02:29 jobi Exp $
* $Id: input_programs.c,v 1.76 2002/03/21 02:27:04 jobi Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -492,6 +492,9 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
p_es->p_decoder_fifo = NULL;
p_es->b_audio = 0;
p_es->i_cat = UNKNOWN_ES;
#ifdef HAVE_SATELLITE
p_es->i_dmx_fd = 0;
#endif
if( i_data_len )
{
......
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