[MPlayer-cvslog] r32580 - trunk/libmpdemux/demux_lavf.c

[reimar]

Author: reimar
Date: Sat Nov  6 15:57:44 2010
New Revision: 32580

Log:
Fix program switching with -demuxer lavf.

Modified:
   trunk/libmpdemux/demux_lavf.c

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Sat Nov  6 15:41:23 2010	(r32579)
+++ trunk/libmpdemux/demux_lavf.c	Sat Nov  6 15:57:44 2010	(r32580)
@@ -800,6 +800,18 @@ redo:
                         break;
                 }
             }
+            if (prog->aid >= 0 && prog->aid < MAX_A_STREAMS &&
+                demuxer->a_streams[prog->aid]) {
+                sh_audio_t *sh = demuxer->a_streams[prog->aid];
+                prog->aid = sh->aid;
+            } else
+                prog->aid = -2;
+            if (prog->vid >= 0 && prog->vid < MAX_V_STREAMS &&
+                demuxer->v_streams[prog->vid]) {
+                sh_video_t *sh = demuxer->v_streams[prog->vid];
+                prog->vid = sh->vid;
+            } else
+                prog->vid = -2;
             if(prog->progid == -1 && prog->vid == -2 && prog->aid == -2)
             {
                 p = (p + 1) % priv->avfc->nb_programs;