Changeset e179dadad0b9dad116aa1c000a77aefd1e5e22d6

Timestamp:

22/08/05 22:24:20 (3 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1124742260 +0000

git-parent:

[630e3b7ad8edfd92e263ccaf13c14e3a6e50ab74]

git-author:

Gildas Bazin <gbazin@videolan.org> 1124742260 +0000

Message:

* src/input/es_out.c: when removing an active track, re-run the track selection algo.

Files:

• src/input/es_out.c (modified) (3 diffs)

src/input/es_out.c

@@ -1059 +1059 @@
-{
-    es_out_sys_t *p_sys = out->p_sys;
+    vlc_bool_t b_reselect = VLC_FALSE;
+    int i;
-
-    /* We don't try to reselect */
@@ -1074 +1076 @@
-        msg_Dbg( p_sys->p_input, "Program doesn't contain anymore ES" );
-    }
+
+    if( p_sys->p_es_audio == es || p_sys->p_es_video == es ||
+        p_sys->p_es_sub == es ) b_reselect = VLC_TRUE;
-
-    if( p_sys->p_es_audio == es ) p_sys->p_es_audio = NULL;
@@ -1091 +1096 @@
-            break;
-    }
+
+    /* Re-select another track when needed */
+    if( b_reselect )
+        for( i = 0; i < p_sys->i_es; i++ )
+        {
+            if( es->fmt.i_cat == p_sys->es[i]->fmt.i_cat )
+                EsOutSelect( out, p_sys->es[i], VLC_FALSE );
+        }
-
-    if( es->psz_language )