[vlc-devel] commit: Fix telx test in es_out.c: p_block->i_rate has not been defined yet , so do it before testing its value. (Jean-Paul Saman )

git version control git at videolan.org
Sat Oct 4 14:39:41 CEST 2008


vlc | branch: 0.9-bugfix | Jean-Paul Saman <jpsaman at videolan.org> | Sun Sep 28 22:57:05 2008 +0200| [02c98de6d4ab924231e50a993af44d32dd0653e2] | committer: Jean-Paul Saman 

Fix telx test in es_out.c: p_block->i_rate has not been defined yet, so do it before testing its value.
(cherry picked from commit 9509b6bba727725f205f561689f653452c73410b)

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

 src/input/es_out.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index f1b4f38..1319e05 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1427,6 +1427,8 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         p_block->i_pts =
             input_ClockGetTS( p_input, &p_pgrm->clock, p_block->i_pts ) + i_delay;
     }
+
+    p_block->i_rate = p_sys->i_rate;
     if ( p_block->i_rate == INPUT_RATE_DEFAULT &&
          es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
     {
@@ -1442,8 +1444,6 @@ static int EsOutSend( es_out_t *out, es_out_id_t *es, block_t *p_block )
         }
     }
 
-    p_block->i_rate = p_sys->i_rate;
-
     /* TODO handle mute */
     if( es->p_dec &&
         ( es->fmt.i_cat != AUDIO_ES ||




More information about the vlc-devel mailing list