diff options
| author | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-14 17:59:26 +0200 |
| commit | e18ffd6b998858ca0797cb0ce4aabd4a509655dd (patch) | |
| tree | 199bddd30923db1175a1331191eb86ba684e9e41 /core/command.c | |
| parent | 3e7d483ac89289f613138002be2043ec5f479bb0 (diff) | |
| parent | 5ead20bdb3328d199dad693039d18e7a05eb2465 (diff) | |
| download | mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.bz2 mpv-e18ffd6b998858ca0797cb0ce4aabd4a509655dd.tar.xz | |
Merge branch 'remove_old_demuxers'
The merged branch doesn't actually just remove old demuxers, but also
includes a branch of cleanups and some refactoring.
Conflicts:
stream/stream.c
Diffstat (limited to 'core/command.c')
| -rw-r--r-- | core/command.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/core/command.c b/core/command.c index 6056596d04..cba9ef5a9a 100644 --- a/core/command.c +++ b/core/command.c @@ -566,13 +566,11 @@ 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; - if (sh_video) - resync_video_stream(sh_video); + if (mpctx->sh_video) + resync_video_stream(mpctx->sh_video); - struct sh_audio *sh_audio = demuxer->audio->sh; - if (sh_audio) - resync_audio_stream(sh_audio); + if (mpctx->sh_audio) + resync_audio_stream(mpctx->sh_audio); } return M_PROPERTY_OK; case M_PROPERTY_GET_TYPE: { |