Commit 0d972bf5 authored by Sam Hocevar's avatar Sam Hocevar

  * ./Makefile: fixed OS X vlc.app compilation dependencies.
  * ./configure.in: fixed the endianness check under Solaris.

  * ./src/input/input.c: strings are now initialized to "" instead of NULL.

  * ./plugins/spudec/spu_decoder.c: we now properly support the subtitle
    palette information we get from the DVD. Subtitles rox !
  * ./src/video_output/vout_subpictures.c: removed all DVD-specific routines
    and put them into spu_decoder.c.
parent 3dd67e8f
...@@ -533,7 +533,7 @@ gnome-vlc gvlc kvlc qvlc: vlc ...@@ -533,7 +533,7 @@ gnome-vlc gvlc kvlc qvlc: vlc
rm -f $@ && ln -s vlc $@ rm -f $@ && ln -s vlc $@
.PHONY: vlc.app .PHONY: vlc.app
vlc.app: Makefile.opts vlc.app: vlc plugins
ifneq (,$(findstring darwin,$(SYS))) ifneq (,$(findstring darwin,$(SYS)))
rm -Rf vlc.app rm -Rf vlc.app
cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t' cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
......
...@@ -3154,11 +3154,11 @@ EOF ...@@ -3154,11 +3154,11 @@ EOF
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \ if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o && test -f conftest.o
then then
if test `grep -l BIGenDianSyS conftest.o` if test "`strings conftest.o | grep BIGenDianSyS`"
then then
ac_cv_c_bigendian=yes ac_cv_c_bigendian=yes
fi fi
if test `grep -l LiTTleEnDian conftest.o` if test "`strings conftest.o | grep LiTTleEnDian`"
then then
ac_cv_c_bigendian=no ac_cv_c_bigendian=no
fi fi
...@@ -3168,7 +3168,7 @@ EOF ...@@ -3168,7 +3168,7 @@ EOF
fi fi
echo "$ac_t""$ac_cv_c_bigendian" 1>&6 echo "$ac_t""$ac_cv_c_bigendian" 1>&6
if test $ac_cv_c_bigendian = xunknown if test x$ac_cv_c_bigendian = xunknown
then then
{ echo "configure: error: Could not guess endianness, please use --with-words" 1>&2; exit 1; } { echo "configure: error: Could not guess endianness, please use --with-words" 1>&2; exit 1; }
fi fi
...@@ -8792,9 +8792,9 @@ which modules get compiled as plugins. ...@@ -8792,9 +8792,9 @@ which modules get compiled as plugins.
" "
if test x${HAVE_VLC} = x1 if test x${HAVE_VLC} = x1
then then
echo "To build vlc and its plugins, type \`make vlc plugins'." echo "To build vlc and its plugins, type \`make'."
fi fi
if test x${HAVE_LIBDVDCSS} = x1 if test x${NEED_LIBDVDCSS} = x1
then then
echo "To build libdvdcss only, type \`make libdvdcss'." echo "To build libdvdcss only, type \`make libdvdcss'."
fi fi
......
...@@ -117,18 +117,18 @@ EOF ...@@ -117,18 +117,18 @@ EOF
if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \ if ${CC-cc} conftest.c -o conftest.o >config.log 2>&1 \
&& test -f conftest.o && test -f conftest.o
then then
if test `grep -l BIGenDianSyS conftest.o` if test "`strings conftest.o | grep BIGenDianSyS`"
then then
ac_cv_c_bigendian=yes ac_cv_c_bigendian=yes
fi fi
if test `grep -l LiTTleEnDian conftest.o` if test "`strings conftest.o | grep LiTTleEnDian`"
then then
ac_cv_c_bigendian=no ac_cv_c_bigendian=no
fi fi
fi fi
fi fi
]) ])
if test $ac_cv_c_bigendian = xunknown if test x$ac_cv_c_bigendian = xunknown
then then
AC_MSG_ERROR([Could not guess endianness, please use --with-words]) AC_MSG_ERROR([Could not guess endianness, please use --with-words])
fi fi
...@@ -1655,9 +1655,9 @@ which modules get compiled as plugins. ...@@ -1655,9 +1655,9 @@ which modules get compiled as plugins.
" "
if test x${HAVE_VLC} = x1 if test x${HAVE_VLC} = x1
then then
echo "To build vlc and its plugins, type \`make vlc plugins'." echo "To build vlc and its plugins, type \`make'."
fi fi
if test x${HAVE_LIBDVDCSS} = x1 if test x${NEED_LIBDVDCSS} = x1
then then
echo "To build libdvdcss only, type \`make libdvdcss'." echo "To build libdvdcss only, type \`make libdvdcss'."
fi fi
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* includes all common video types and constants. * includes all common video types and constants.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: video.h,v 1.44 2002/03/01 00:33:18 massiot Exp $ * $Id: video.h,v 1.45 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -314,6 +314,7 @@ typedef struct subpicture_s ...@@ -314,6 +314,7 @@ typedef struct subpicture_s
int i_width; /* picture width */ int i_width; /* picture width */
int i_height; /* picture height */ int i_height; /* picture height */
#if 0
/* Additionnal properties depending of the subpicture type */ /* Additionnal properties depending of the subpicture type */
union union
{ {
...@@ -327,22 +328,22 @@ typedef struct subpicture_s ...@@ -327,22 +328,22 @@ typedef struct subpicture_s
u32 i_border_color; /* border color */ u32 i_border_color; /* border color */
u32 i_bg_color; /* background color */ u32 i_bg_color; /* background color */
} text; } text;
/* DVD subpicture units properties */
struct
{
int i_offset[2]; /* byte offsets to data */
} spu;
} type; } type;
#endif
/* The subpicture rendering routine */
void ( *pf_render ) ( const struct vout_thread_s *, picture_t *,
const struct subpicture_s * );
/* Private data - the subtitle plugin might want to put stuff here to
* keep track of the subpicture */
struct subpicture_sys_s *p_sys; /* subpicture data */
/* Subpicture data, format depends of type - data can always be freely
* modified. p_data itself (the pointer) should NEVER be modified. */
void * p_data; /* subpicture data */
} subpicture_t; } subpicture_t;
/* Subpicture type */ /* Subpicture type */
#define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */ #define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */
#define DVD_SUBPICTURE 100 /* DVD subpicture unit */ #define MEMORY_SUBPICTURE 100 /* subpicture stored in memory */
#define TEXT_SUBPICTURE 200 /* single line text */
/* Subpicture status */ /* Subpicture status */
#define FREE_SUBPICTURE 0 /* free and not allocated */ #define FREE_SUBPICTURE 0 /* free and not allocated */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* file.c: file input (file: access plug-in) * file.c: file input (file: access plug-in)
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: file.c,v 1.1 2002/03/01 00:33:18 massiot Exp $ * $Id: file.c,v 1.2 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -112,8 +112,7 @@ static int FileOpen( input_thread_t * p_input ) ...@@ -112,8 +112,7 @@ static int FileOpen( input_thread_t * p_input )
vlc_mutex_lock( &p_input->stream.stream_lock ); vlc_mutex_lock( &p_input->stream.stream_lock );
if( p_input->psz_access != NULL if( *p_input->psz_access && !strncmp( p_input->psz_access, "stream", 7 ) )
&& !strncmp( p_input->psz_access, "stream", 7 ) )
{ {
/* stream:%s */ /* stream:%s */
p_input->stream.b_pace_control = 0; p_input->stream.b_pace_control = 0;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c: HTTP access plug-in * http.c: HTTP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: http.c,v 1.3 2002/03/11 07:23:09 gbazin Exp $ * $Id: http.c,v 1.4 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -216,9 +216,9 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -216,9 +216,9 @@ static int HTTPOpen( input_thread_t * p_input )
{ {
_input_socket_t * p_access_data; _input_socket_t * p_access_data;
char * psz_parser = p_input->psz_name; char * psz_parser = p_input->psz_name;
char * psz_server_addr = NULL; char * psz_server_addr = "";
char * psz_server_port = NULL; char * psz_server_port = "";
char * psz_path = NULL; char * psz_path = "";
char * psz_proxy; char * psz_proxy;
int i_server_port = 0; int i_server_port = 0;
...@@ -229,7 +229,7 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -229,7 +229,7 @@ static int HTTPOpen( input_thread_t * p_input )
return( -1 ); return( -1 );
} }
p_access_data->psz_network = NULL; p_access_data->psz_network = "";
if( config_GetIntVariable( "ipv4" ) ) if( config_GetIntVariable( "ipv4" ) )
{ {
p_access_data->psz_network = "ipv4"; p_access_data->psz_network = "ipv4";
...@@ -238,7 +238,7 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -238,7 +238,7 @@ static int HTTPOpen( input_thread_t * p_input )
{ {
p_access_data->psz_network = "ipv6"; p_access_data->psz_network = "ipv6";
} }
if( p_input->psz_access != NULL ) if( *p_input->psz_access )
{ {
/* Find out which shortcut was used */ /* Find out which shortcut was used */
if( !strncmp( p_input->psz_access, "http6", 5 ) ) if( !strncmp( p_input->psz_access, "http6", 5 ) )
...@@ -284,7 +284,7 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -284,7 +284,7 @@ static int HTTPOpen( input_thread_t * p_input )
} }
/* Convert port format */ /* Convert port format */
if( psz_server_port != NULL ) if( *psz_server_port )
{ {
i_server_port = strtol( psz_server_port, &psz_parser, 10 ); i_server_port = strtol( psz_server_port, &psz_parser, 10 );
if( *psz_parser ) if( *psz_parser )
...@@ -301,7 +301,7 @@ static int HTTPOpen( input_thread_t * p_input ) ...@@ -301,7 +301,7 @@ static int HTTPOpen( input_thread_t * p_input )
i_server_port = 80; i_server_port = 80;
} }
if( psz_server_addr == NULL ) if( !*psz_server_addr )
{ {
intf_ErrMsg( "input error: no server given" ); intf_ErrMsg( "input error: no server given" );
free( p_input->p_access_data ); free( p_input->p_access_data );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* udp.c: raw UDP access plug-in * udp.c: raw UDP access plug-in
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.3 2002/03/11 07:23:09 gbazin Exp $ * $Id: udp.c,v 1.4 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -98,12 +98,12 @@ static int UDPOpen( input_thread_t * p_input ) ...@@ -98,12 +98,12 @@ static int UDPOpen( input_thread_t * p_input )
{ {
input_socket_t * p_access_data; input_socket_t * p_access_data;
struct module_s * p_network; struct module_s * p_network;
char * psz_network = NULL; char * psz_network = "";
char * psz_parser = p_input->psz_name; char * psz_parser = p_input->psz_name;
char * psz_server_addr = NULL; char * psz_server_addr = "";
char * psz_server_port = NULL; char * psz_server_port = "";
char * psz_bind_addr = NULL; char * psz_bind_addr = "";
char * psz_bind_port = NULL; char * psz_bind_port = "";
int i_bind_port = 0, i_server_port = 0; int i_bind_port = 0, i_server_port = 0;
network_socket_t socket_desc; network_socket_t socket_desc;
...@@ -116,7 +116,7 @@ static int UDPOpen( input_thread_t * p_input ) ...@@ -116,7 +116,7 @@ static int UDPOpen( input_thread_t * p_input )
psz_network = "ipv6"; psz_network = "ipv6";
} }
if( p_input->psz_access != NULL ) if( *p_input->psz_access )
{ {
/* Find out which shortcut was used */ /* Find out which shortcut was used */
if( !strncmp( p_input->psz_access, "udp6", 5 ) ) if( !strncmp( p_input->psz_access, "udp6", 5 ) )
...@@ -200,7 +200,7 @@ static int UDPOpen( input_thread_t * p_input ) ...@@ -200,7 +200,7 @@ static int UDPOpen( input_thread_t * p_input )
} }
/* Convert ports format */ /* Convert ports format */
if( psz_server_port != NULL ) if( *psz_server_port )
{ {
i_server_port = strtol( psz_server_port, &psz_parser, 10 ); i_server_port = strtol( psz_server_port, &psz_parser, 10 );
if( *psz_parser ) if( *psz_parser )
...@@ -211,7 +211,7 @@ static int UDPOpen( input_thread_t * p_input ) ...@@ -211,7 +211,7 @@ static int UDPOpen( input_thread_t * p_input )
} }
} }
if( psz_bind_port != NULL ) if( *psz_bind_port )
{ {
i_bind_port = strtol( psz_bind_port, &psz_parser, 10 ); i_bind_port = strtol( psz_bind_port, &psz_parser, 10 );
if( *psz_parser ) if( *psz_parser )
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: dvd_access.c,v 1.7 2002/03/15 00:57:16 stef Exp $ * $Id: dvd_access.c,v 1.8 2002/03/15 04:41:54 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -662,7 +662,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -662,7 +662,7 @@ static char * DVDParse( input_thread_t * p_input )
} }
else else
{ {
psz_raw = NULL; psz_raw = "";
} }
if( *psz_parser && !strtol( psz_parser, NULL, 10 ) ) if( *psz_parser && !strtol( psz_parser, NULL, 10 ) )
...@@ -695,7 +695,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -695,7 +695,7 @@ static char * DVDParse( input_thread_t * p_input )
{ {
/* we have only a partial list of options, no device */ /* we have only a partial list of options, no device */
psz_parser = psz_raw; psz_parser = psz_raw;
psz_raw = NULL; psz_raw = "";
b_options = 1; b_options = 1;
break; break;
} }
...@@ -706,7 +706,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -706,7 +706,7 @@ static char * DVDParse( input_thread_t * p_input )
else else
{ {
/* found beginning of options ; no raw device specified */ /* found beginning of options ; no raw device specified */
psz_raw = NULL; psz_raw = "";
b_options = 1; b_options = 1;
} }
...@@ -729,7 +729,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -729,7 +729,7 @@ static char * DVDParse( input_thread_t * p_input )
p_dvd->i_angle = i_angle ? i_angle : 1; p_dvd->i_angle = i_angle ? i_angle : 1;
} }
if( psz_raw ) if( *psz_raw )
{ {
if( *psz_raw ) if( *psz_raw )
{ {
...@@ -741,7 +741,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -741,7 +741,7 @@ static char * DVDParse( input_thread_t * p_input )
psz_raw, strerror(errno)); psz_raw, strerror(errno));
/* put back '@' */ /* put back '@' */
*(psz_raw - 1) = '@'; *(psz_raw - 1) = '@';
psz_raw = NULL; psz_raw = "";
} }
else else
{ {
...@@ -754,7 +754,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -754,7 +754,7 @@ static char * DVDParse( input_thread_t * p_input )
" not a valid char device", psz_raw ); " not a valid char device", psz_raw );
/* put back '@' */ /* put back '@' */
*(psz_raw - 1) = '@'; *(psz_raw - 1) = '@';
psz_raw = NULL; psz_raw = "";
} }
else else
#endif #endif
...@@ -768,7 +768,7 @@ static char * DVDParse( input_thread_t * p_input ) ...@@ -768,7 +768,7 @@ static char * DVDParse( input_thread_t * p_input )
} }
else else
{ {
psz_raw = NULL; psz_raw = "";
} }
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ipv4.c: IPv4 network abstraction layer * ipv4.c: IPv4 network abstraction layer
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: ipv4.c,v 1.5 2002/03/11 07:23:09 gbazin Exp $ * $Id: ipv4.c,v 1.6 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Mathias Kretschmer <mathias@research.att.com> * Mathias Kretschmer <mathias@research.att.com>
...@@ -104,7 +104,7 @@ static int BuildAddr( struct sockaddr_in * p_socket, ...@@ -104,7 +104,7 @@ static int BuildAddr( struct sockaddr_in * p_socket,
memset( p_socket, 0, sizeof( struct sockaddr_in ) ); memset( p_socket, 0, sizeof( struct sockaddr_in ) );
p_socket->sin_family = AF_INET; /* family */ p_socket->sin_family = AF_INET; /* family */
p_socket->sin_port = htons( i_port ); p_socket->sin_port = htons( i_port );
if( psz_address == NULL ) if( !*psz_address )
{ {
p_socket->sin_addr.s_addr = INADDR_ANY; p_socket->sin_addr.s_addr = INADDR_ANY;
} }
...@@ -229,7 +229,7 @@ static int OpenUDP( network_socket_t * p_socket ) ...@@ -229,7 +229,7 @@ static int OpenUDP( network_socket_t * p_socket )
if (IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) ) if (IN_MULTICAST( ntohl( inet_addr(psz_bind_addr) ) ) )
{ {
psz_bind_win32 = NULL ; psz_bind_win32 = "";
} }
if ( BuildAddr( &sock, psz_bind_win32, i_bind_port ) == -1 ) if ( BuildAddr( &sock, psz_bind_win32, i_bind_port ) == -1 )
#else #else
...@@ -249,7 +249,7 @@ static int OpenUDP( network_socket_t * p_socket ) ...@@ -249,7 +249,7 @@ static int OpenUDP( network_socket_t * p_socket )
} }
/* Allow broadcast reception if we bound on INADDR_ANY */ /* Allow broadcast reception if we bound on INADDR_ANY */
if( psz_bind_addr == NULL ) if( !*psz_bind_addr )
{ {
i_opt = 1; i_opt = 1;
if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST, if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
...@@ -289,7 +289,7 @@ static int OpenUDP( network_socket_t * p_socket ) ...@@ -289,7 +289,7 @@ static int OpenUDP( network_socket_t * p_socket )
} }
} }
if( psz_server_addr != NULL ) if( *psz_server_addr )
{ {
/* Build socket for remote connection */ /* Build socket for remote connection */
if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 ) if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ipv6.c: IPv6 network abstraction layer * ipv6.c: IPv6 network abstraction layer
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: ipv6.c,v 1.2 2002/03/11 07:23:09 gbazin Exp $ * $Id: ipv6.c,v 1.3 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Alexis Guillard <alexis.guillard@bt.com> * Authors: Alexis Guillard <alexis.guillard@bt.com>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -104,7 +104,7 @@ static int BuildAddr( struct sockaddr_in6 * p_socket, ...@@ -104,7 +104,7 @@ static int BuildAddr( struct sockaddr_in6 * p_socket,
memset( p_socket, 0, sizeof( struct sockaddr_in6 ) ); memset( p_socket, 0, sizeof( struct sockaddr_in6 ) );
p_socket->sin6_family = AF_INET6; /* family */ p_socket->sin6_family = AF_INET6; /* family */
p_socket->sin6_port = htons( i_port ); p_socket->sin6_port = htons( i_port );
if( psz_address == NULL ) if( !*psz_address )
{ {
p_socket->sin6_addr = in6addr_any; p_socket->sin6_addr = in6addr_any;
} }
...@@ -214,7 +214,7 @@ static int OpenUDP( network_socket_t * p_socket ) ...@@ -214,7 +214,7 @@ static int OpenUDP( network_socket_t * p_socket )
} }
/* Allow broadcast reception if we bound on in6addr_any */ /* Allow broadcast reception if we bound on in6addr_any */
if( psz_bind_addr == NULL ) if( !*psz_bind_addr )
{ {
i_opt = 1; i_opt = 1;
if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST, if( setsockopt( i_handle, SOL_SOCKET, SO_BROADCAST,
...@@ -229,7 +229,7 @@ static int OpenUDP( network_socket_t * p_socket ) ...@@ -229,7 +229,7 @@ static int OpenUDP( network_socket_t * p_socket )
/* Join the multicast group if the socket is a multicast address */ /* Join the multicast group if the socket is a multicast address */
/* FIXME: To be written */ /* FIXME: To be written */
if( psz_server_addr != NULL ) if( *psz_server_addr )
{ {
/* Build socket for remote connection */ /* Build socket for remote connection */
if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 ) if ( BuildAddr( &sock, psz_server_addr, i_server_port ) == -1 )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* spu_decoder.c : spu decoder thread * spu_decoder.c : spu decoder thread
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: spu_decoder.c,v 1.11 2002/03/14 01:35:28 stef Exp $ * $Id: spu_decoder.c,v 1.12 2002/03/15 04:41:54 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -57,6 +57,8 @@ static int SyncPacket ( spudec_thread_t * ); ...@@ -57,6 +57,8 @@ static int SyncPacket ( spudec_thread_t * );
static void ParsePacket ( spudec_thread_t * ); static void ParsePacket ( spudec_thread_t * );
static int ParseControlSequences( spudec_thread_t *, subpicture_t * ); static int ParseControlSequences( spudec_thread_t *, subpicture_t * );
static int ParseRLE ( spudec_thread_t *, subpicture_t *, u8 * ); static int ParseRLE ( spudec_thread_t *, subpicture_t *, u8 * );
static void RenderSPU ( const vout_thread_t *, picture_t *,
const subpicture_t * );
/***************************************************************************** /*****************************************************************************
* Capabilities * Capabilities
...@@ -102,8 +104,6 @@ static int decoder_Probe( u8 *pi_type ) ...@@ -102,8 +104,6 @@ static int decoder_Probe( u8 *pi_type )
static int decoder_Run( decoder_config_t * p_config ) static int decoder_Run( decoder_config_t * p_config )
{ {
spudec_thread_t * p_spudec; spudec_thread_t * p_spudec;
int i;
u32 * pi_yuv_color;
intf_WarnMsg( 3, "spudec: thread launched. Initializing ..." ); intf_WarnMsg( 3, "spudec: thread launched. Initializing ..." );
...@@ -130,17 +130,6 @@ static int decoder_Run( decoder_config_t * p_config ) ...@@ -130,17 +130,6 @@ static int decoder_Run( decoder_config_t * p_config )
*/ */
p_spudec->p_fifo->b_error = InitThread( p_spudec ); p_spudec->p_fifo->b_error = InitThread( p_spudec );
pi_yuv_color = p_config->p_demux_data;
for( i=0 ; i<16 ; i++ )
{
intf_WarnMsg( 12, "spudec info: 0x%02x 0x%02x 0x%02x 0x%02x",
*((u8*)(pi_yuv_color)),
*((u8*)(pi_yuv_color) + 1),
*((u8*)(pi_yuv_color) + 2),
*((u8*)(pi_yuv_color) + 3));
pi_yuv_color++;
}