Commit 3e5f531b authored by Sam Hocevar's avatar Sam Hocevar

  * Fixed a little crash introduced in my previous commit :-)
  * Removed more unused code.
parent 4a0dae01
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* motionmmxext.c : MMX EXT motion compensation module for vlc * motionmmxext.c : MMX EXT motion compensation module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: motionmmxext.c,v 1.11 2001/09/06 14:02:56 massiot Exp $ * $Id: motionmmxext.c,v 1.12 2001/11/15 18:11:50 sam Exp $
* *
* Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca> * Authors: Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
* Michel Lespinasse <walken@zoy.org> * Michel Lespinasse <walken@zoy.org>
...@@ -562,30 +562,6 @@ static void MC_put_y8_3dnow (yuv_data_t * dest, yuv_data_t * ref, ...@@ -562,30 +562,6 @@ static void MC_put_y8_3dnow (yuv_data_t * dest, yuv_data_t * ref,
MC_put2_8 (height, dest, ref, stride, stride, CPU_3DNOW); MC_put2_8 (height, dest, ref, stride, stride, CPU_3DNOW);
} }
static void MC_avg_xy16_3dnow (yuv_data_t * dest, yuv_data_t * ref,
int stride, int height)
{
MC_avg4_16 (height, dest, ref, stride, CPU_3DNOW);
}
static void MC_avg_xy8_3dnow (yuv_data_t * dest, yuv_data_t * ref,
int stride, int height)
{
MC_avg4_8 (height, dest, ref, stride, CPU_3DNOW);
}
static void MC_put_xy16_3dnow (yuv_data_t * dest, yuv_data_t * ref,
int stride, int height)
{
MC_put4_16 (height, dest, ref, stride, CPU_3DNOW);
}
static void MC_put_xy8_3dnow (yuv_data_t * dest, yuv_data_t * ref,
int stride, int height)
{
MC_put4_8 (height, dest, ref, stride, CPU_3DNOW);
}
/***************************************************************************** /*****************************************************************************
* Functions exported as capabilities. They are declared as static so that * Functions exported as capabilities. They are declared as static so that
* we don't pollute the namespace too much. * we don't pollute the namespace too much.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_dec.c: Functions for the management of decoders * input_dec.c: Functions for the management of decoders
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input_dec.c,v 1.15 2001/11/15 17:39:13 sam Exp $ * $Id: input_dec.c,v 1.16 2001/11/15 18:11:50 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -130,6 +130,9 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es ) ...@@ -130,6 +130,9 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es )
/* Unneed module */ /* Unneed module */
module_Unneed( p_es->p_module ); module_Unneed( p_es->p_module );
/* Tell the input there is no more decoder */
p_es->p_decoder_fifo = NULL;
} }
/***************************************************************************** /*****************************************************************************
...@@ -272,6 +275,7 @@ static decoder_config_t * CreateDecoderConfig( input_thread_t * p_input, ...@@ -272,6 +275,7 @@ static decoder_config_t * CreateDecoderConfig( input_thread_t * p_input,
static void DeleteDecoderConfig( decoder_config_t * p_config ) static void DeleteDecoderConfig( decoder_config_t * p_config )
{ {
/* Free all packets still in the decoder fifo. */ /* Free all packets still in the decoder fifo. */
#if 0
while( !DECODER_FIFO_ISEMPTY( *p_config->p_decoder_fifo ) ) while( !DECODER_FIFO_ISEMPTY( *p_config->p_decoder_fifo ) )
{ {
p_config->p_decoder_fifo->pf_delete_pes( p_config->p_decoder_fifo->pf_delete_pes(
...@@ -279,13 +283,13 @@ static void DeleteDecoderConfig( decoder_config_t * p_config ) ...@@ -279,13 +283,13 @@ static void DeleteDecoderConfig( decoder_config_t * p_config )
DECODER_FIFO_START( *p_config->p_decoder_fifo ) ); DECODER_FIFO_START( *p_config->p_decoder_fifo ) );
DECODER_FIFO_INCSTART( *p_config->p_decoder_fifo ); DECODER_FIFO_INCSTART( *p_config->p_decoder_fifo );
} }
#endif
/* Destroy the lock and cond */ /* Destroy the lock and cond */
vlc_cond_destroy( &p_config->p_decoder_fifo->data_wait ); vlc_cond_destroy( &p_config->p_decoder_fifo->data_wait );
vlc_mutex_destroy( &p_config->p_decoder_fifo->data_lock ); vlc_mutex_destroy( &p_config->p_decoder_fifo->data_lock );
free( p_config->p_decoder_fifo ); free( p_config->p_decoder_fifo );
p_config->p_decoder_fifo = NULL;
free( p_config ); free( p_config );
} }
......
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