Commit f2dda725 authored by Laurent Aimar's avatar Laurent Aimar

Removed unused b_error field (transcode).

parent e71a9375
...@@ -25,7 +25,6 @@ struct sout_stream_sys_t ...@@ -25,7 +25,6 @@ struct sout_stream_sys_t
vlc_cond_t cond; vlc_cond_t cond;
picture_t * pp_pics[PICTURE_RING_SIZE]; picture_t * pp_pics[PICTURE_RING_SIZE];
int i_first_pic, i_last_pic; int i_first_pic, i_last_pic;
bool b_error;
/* Audio */ /* Audio */
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */ vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
......
...@@ -132,7 +132,7 @@ static void* EncoderThread( vlc_object_t* p_this ) ...@@ -132,7 +132,7 @@ static void* EncoderThread( vlc_object_t* p_this )
picture_t *p_pic; picture_t *p_pic;
int canc = vlc_savecancel (); int canc = vlc_savecancel ();
while( vlc_object_alive (p_sys) && !p_sys->b_error ) while( vlc_object_alive (p_sys) )
{ {
block_t *p_block; block_t *p_block;
...@@ -140,9 +140,9 @@ static void* EncoderThread( vlc_object_t* p_this ) ...@@ -140,9 +140,9 @@ static void* EncoderThread( vlc_object_t* p_this )
while( p_sys->i_last_pic == p_sys->i_first_pic ) while( p_sys->i_last_pic == p_sys->i_first_pic )
{ {
vlc_cond_wait( &p_sys->cond, &p_sys->lock_out ); vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
if( !vlc_object_alive (p_sys) || p_sys->b_error ) break; if( !vlc_object_alive (p_sys) ) break;
} }
if( !vlc_object_alive (p_sys) || p_sys->b_error ) if( !vlc_object_alive (p_sys) )
{ {
vlc_mutex_unlock( &p_sys->lock_out ); vlc_mutex_unlock( &p_sys->lock_out );
break; break;
...@@ -274,7 +274,7 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id ) ...@@ -274,7 +274,7 @@ int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
p_sys->i_first_pic = 0; p_sys->i_first_pic = 0;
p_sys->i_last_pic = 0; p_sys->i_last_pic = 0;
p_sys->p_buffers = NULL; p_sys->p_buffers = NULL;
p_sys->b_die = p_sys->b_error = 0; p_sys->b_die = 0;
if( vlc_thread_create( p_sys, EncoderThread, i_priority ) ) if( vlc_thread_create( p_sys, EncoderThread, i_priority ) )
{ {
msg_Err( p_stream, "cannot spawn encoder thread" ); msg_Err( p_stream, "cannot spawn encoder thread" );
......
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