[vlc-commits] demux: asf: set es id to stream number

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 23 20:23:12 2015 +0100| [31ef8e654f1aa72bc99b2223d0527bcd9cfdbbda] | committer: Jean-Baptiste Kempf

demux: asf: set es id to stream number

Should fix mmsh stream selection

(cherry picked from commit 35b4c344a39fd25b849400032c04e2701fefcb33)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/asf/asf.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index 0c6ba0b..789b5e0 100644
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -430,7 +430,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         int i_ret;
         if ( i >= 0 )
         {
-            i++; /* video/audio-es variable starts 0 */
             msg_Dbg( p_demux, "Requesting access to enable stream %d", i );
             i_ret = stream_Control( p_demux->s, STREAM_SET_PRIVATE_ID_STATE, i, true );
         }
@@ -1500,6 +1499,8 @@ static int DemuxInit( demux_t *p_demux )
                     es_format_Copy( tk->p_fmt, &fmt );
             }
 
+            fmt.i_id = tk->info.p_sp->i_stream_number;
+
             tk->p_es = es_out_Add( p_demux->out, &fmt );
 
             if( !stream_Control( p_demux->s, STREAM_GET_PRIVATE_ID_STATE,