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 /core/command.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 'core/command.c')
| -rw-r--r-- | core/command.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/command.c b/core/command.c index 80f6f5d9d2..fb21d7bc41 100644 --- a/core/command.c +++ b/core/command.c @@ -566,13 +566,13 @@ static int mp_property_angle(m_option_t *prop, int action, void *arg, case M_PROPERTY_SET: angle = demuxer_set_angle(demuxer, *(int *)arg); if (angle >= 0) { - struct sh_video *sh_video = demuxer->video->sh; + struct sh_stream *sh_video = demuxer->video->gsh; if (sh_video) - resync_video_stream(sh_video); + resync_video_stream(sh_video->video); - struct sh_audio *sh_audio = demuxer->audio->sh; + struct sh_stream *sh_audio = demuxer->audio->gsh; if (sh_audio) - resync_audio_stream(sh_audio); + resync_audio_stream(sh_audio->audio); } return M_PROPERTY_OK; case M_PROPERTY_GET_TYPE: { |