[vlc-commits] Removed unused b_error field (transcode).

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 18 21:47:56 2011 +0200| [f2dda72529dfb327b750ac147223b6cfffa9898e] | committer: Laurent Aimar

Removed unused b_error field (transcode).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f2dda72529dfb327b750ac147223b6cfffa9898e
---

 modules/stream_out/transcode/transcode.h |    1 -
 modules/stream_out/transcode/video.c     |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index 3be010e..8e8db25 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -25,7 +25,6 @@ struct sout_stream_sys_t
     vlc_cond_t      cond;
     picture_t *     pp_pics[PICTURE_RING_SIZE];
     int             i_first_pic, i_last_pic;
-    bool            b_error;
 
     /* Audio */
     vlc_fourcc_t    i_acodec;   /* codec audio (0 if not transcode) */
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 662020d..b85b1a5 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -132,7 +132,7 @@ static void* EncoderThread( vlc_object_t* p_this )
     picture_t *p_pic;
     int canc = vlc_savecancel ();
 
-    while( vlc_object_alive (p_sys) && !p_sys->b_error )
+    while( vlc_object_alive (p_sys) )
     {
         block_t *p_block;
 
@@ -140,9 +140,9 @@ static void* EncoderThread( vlc_object_t* p_this )
         while( p_sys->i_last_pic == p_sys->i_first_pic )
         {
             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 );
             break;
@@ -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_last_pic = 0;
         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 ) )
         {
             msg_Err( p_stream, "cannot spawn encoder thread" );