Changeset 481e0b5b20aacd8fdedd3dc19693a5323661c948

Timestamp:

14/10/07 14:14:03 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1192364043 +0000

git-parent:

[a73c1e418459e18f3ced45286c2439a4dc0ae669]

git-author:

Laurent Aimar <fenrir@videolan.org> 1192364043 +0000

Message:

Fixed segfault with --minimize-threads

Files:

• src/input/decoder.c (modified) (8 diffs)

src/input/decoder.c

@@ -342 +342 @@
-    p_dec->pf_packetize = 0;
-
-
+ 
-    p_dec->p_module = NULL;
-
@@ -680 +680 @@
-    else if( p_dec->fmt_in.i_cat == AUDIO_ES )
-    {
-
+
+
-
-        if( p_dec->p_owner->p_packetizer )
@@ -688 +689 @@
-
-            while( (p_packetized_block =
-&p_block
+p_block ? &p_block : NULL
-            {
-                if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
@@ -708 +709 @@
-            }
-        }
-
+ if( p_block )
-        {
-            DecoderDecodeAudio( p_dec, p_block );
@@ -715 +716 @@
-    else if( p_dec->fmt_in.i_cat == VIDEO_ES )
-    {
-
+
+
-
-        if( p_dec->p_owner->p_packetizer )
@@ -723 +725 @@
-
-            while( (p_packetized_block =
-&p_block
+p_block ? &p_block : NULL
-            {
-                if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
@@ -743 +745 @@
-            }
-        }
-
+ if( p_block )
-        {
-            DecoderDecodeVideo( p_dec, p_block );
@@ -754 +756 @@
-        subpicture_t *p_spu;
-
-
-
-
+
+
+
+
-        {
-            vlc_mutex_lock( &p_input->p->counters.counters_lock );