From 3b37fadc5dedae742cf7d9db69c9656b596d8a7c Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 Feb 2013 21:19:00 +0100 Subject: demux_lavf: remove weird stream auto-selection Should be dead code. Stream selection is handled either during demuxer initialization, or via DEMUXER_CTRL_SWITCH_*. (If there were actually situations where this code did something, it was probably broken anyway.) --- demux/demux_lavf.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'demux') diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 1d03d3f217..16b9414560 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -785,19 +785,9 @@ static int demux_lavf_fill_buffer(demuxer_t *demux, demux_stream_t *dsds) if (id == demux->audio->id) { // audio ds = demux->audio; - if (!ds->sh) { - ds->sh = demux->a_streams[id]; - mp_msg(MSGT_DEMUX, MSGL_V, "Auto-selected LAVF audio ID = %d\n", - ds->id); - } } else if (id == demux->video->id) { // video ds = demux->video; - if (!ds->sh) { - ds->sh = demux->v_streams[id]; - mp_msg(MSGT_DEMUX, MSGL_V, "Auto-selected LAVF video ID = %d\n", - ds->id); - } } else if (id == demux->sub->id) { // subtitle ds = demux->sub; -- cgit v1.2.3