[vlc-devel] commit: Fixed es selection regression. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Tue Nov 18 00:47:31 2008 +0100| [9c315c227a1cb427a1b855d88b85370361a8b233] | committer: Laurent Aimar 

Fixed es selection regression.

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

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

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 990e391..bfbfcef 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -1322,7 +1322,7 @@ static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
     es_format_Copy( &es->fmt, fmt );
     if( es->fmt.i_id < 0 )
         es->fmt.i_id = out->p_sys->i_id;
-    es->i_id = fmt->i_id;
+    es->i_id = es->fmt.i_id;
 
     switch( es->fmt.i_cat )
     {
@@ -1358,8 +1358,8 @@ static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
         if( es->fmt.video.i_frame_rate && es->fmt.video.i_frame_rate_base )
             vlc_ureduce( &es->fmt.video.i_frame_rate,
                          &es->fmt.video.i_frame_rate_base,
-                         fmt->video.i_frame_rate,
-                         fmt->video.i_frame_rate_base, 0 );
+                         es->fmt.video.i_frame_rate,
+                         es->fmt.video.i_frame_rate_base, 0 );
         break;
 
     case SPU_ES: