From 8d89878e7f1da22ce74926867e79aede07b28122 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 6 Nov 2010 14:57:44 +0000
Subject: demux_lavf: Fix program switching

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32580 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_lavf.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'libmpdemux')

diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 3f1fd8955d..be184a8f64 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -899,6 +899,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;
-- 
cgit v1.2.3