Commit f1632229 authored by Jon Lech Johansen's avatar Jon Lech Johansen

Don`t use long long, use u64/s64 (int_types.h).

Fixed a stale pointer in mpeg_vdec_Run().
parent 25c83d44
......@@ -2,7 +2,7 @@
* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* $Id: video_parser.c,v 1.2 2001/11/15 17:39:12 sam Exp $
* $Id: video_parser.c,v 1.3 2001/11/21 22:33:03 jlj Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
......@@ -125,6 +125,7 @@ static int mpeg_vdec_Probe( probedata_t *p_data )
static int mpeg_vdec_Run ( decoder_config_t * p_config )
{
vpar_thread_t * p_vpar;
boolean_t b_error;
intf_DbgMsg( "vpar debug: video parser thread created. Initializing..." );
......@@ -173,7 +174,7 @@ static int mpeg_vdec_Run ( decoder_config_t * p_config )
/*
* Error loop
*/
if( p_vpar->p_fifo->b_error )
if( ( b_error = p_vpar->p_fifo->b_error ) )
{
mpeg_vdec_ErrorThread( p_vpar );
}
......@@ -181,7 +182,7 @@ static int mpeg_vdec_Run ( decoder_config_t * p_config )
/* End of thread */
mpeg_vdec_EndThread( p_vpar );
if( p_vpar->p_fifo->b_error )
if( b_error )
{
return( -1 );
}
......
......@@ -2,7 +2,7 @@
* netutils.c: various network functions
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: netutils.c,v 1.47 2001/11/21 16:47:46 massiot Exp $
* $Id: netutils.c,v 1.48 2001/11/21 22:33:03 jlj Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -335,7 +335,7 @@ int network_ChannelJoin( int i_channel )
/* Build the message */
sprintf( psz_mess, "%d %u %lu %s \n", i_channel, VLCS_VERSION,
(unsigned long)(mdate() / (unsigned long long)1000000),
(unsigned long)(mdate() / (u64)1000000),
psz_mac );
/* Send the message */
......
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