diff options
| author | wm4 <wm4@nowhere> | 2013-07-08 01:26:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-08 01:36:02 +0200 |
| commit | 05ae5afd6249af9770eb1e55104fbd4f510c2342 (patch) | |
| tree | ed527373fe42a37f24d4eb43a7a7721d7145fd38 /demux/demux_mng.c | |
| parent | 50808bab8db030acd07433e58465d1e71bca2269 (diff) | |
| download | mpv-05ae5afd6249af9770eb1e55104fbd4f510c2342.tar.bz2 mpv-05ae5afd6249af9770eb1e55104fbd4f510c2342.tar.xz | |
demux: remove separate arrays for audio/video/sub streams, simplify
These separate arrays were used by the old demuxers and are not needed
anymore. We can simplify track switching as well.
One interesting thing is that stream/tv.c (which is a demuxer) won't
respect --no-audio anymore. It will probably work as expected, but it
will still open an audio device etc. - this is because track selection
is now always done with the runtime track switching mechanism. Maybe
the TV code could be updated to do proper runtime switching, but I
can't test this stuff.
Diffstat (limited to 'demux/demux_mng.c')
| -rw-r--r-- | demux/demux_mng.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/demux/demux_mng.c b/demux/demux_mng.c index 4b2077d31f..1f73399902 100644 --- a/demux/demux_mng.c +++ b/demux/demux_mng.c @@ -426,11 +426,6 @@ static demuxer_t * demux_mng_open(demuxer_t * demuxer) struct sh_stream *sh = new_sh_stream(demuxer, STREAM_VIDEO); sh_video = sh->video; - // Make sure the demuxer knows about the new video stream header - // (even though new_sh_video() ought to take care of it). - // (Thanks to demux_gif.c for this.) - demuxer->video->sh = sh_video; - // Make sure that the video demuxer stream header knows about its // parent video demuxer stream (this is getting wacky), or else // video_read_properties() will choke. |