[vlc-devel] commit: Fix deadlock when the decoder return an error. (Laurent Aimar )

git version control git at videolan.org
Wed Nov 19 21:23:13 CET 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed Nov 19 21:22:30 2008 +0100| [769bef8771a9586acd5533e89a8ccb80453f4fb3] | committer: Laurent Aimar 

Fix deadlock when the decoder return an error.

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

 src/input/decoder.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 93b27c0..87d5dc8 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -823,13 +823,9 @@ static void *DecoderThread( vlc_object_t *p_this )
         if( p_block )
         {
             if( p_dec->b_error )
-            {   /* Trash all received PES packets */
                 block_Release( p_block );
-            }
-            else if( DecoderProcess( p_dec, p_block ) != VLC_SUCCESS )
-            {
-                break;
-            }
+            else
+                DecoderProcess( p_dec, p_block );
         }
     }
 




More information about the vlc-devel mailing list