diff options
| author | wm4 <wm4@nowhere> | 2013-11-27 20:54:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-27 21:14:39 +0100 |
| commit | 1e96f5bcd98f41fa11d87f1a5236468f985327a9 (patch) | |
| tree | 34d0de4c79fdd9023415f4d5bfe2380ae7bd55c5 /mpvcore | |
| parent | f09b2ff661040828e2b17fad89613f7706b10e7d (diff) | |
| download | mpv-1e96f5bcd98f41fa11d87f1a5236468f985327a9.tar.bz2 mpv-1e96f5bcd98f41fa11d87f1a5236468f985327a9.tar.xz | |
Move some code from player to audio/video reset functions
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/player/playloop.c | 9 | ||||
| -rw-r--r-- | mpvcore/player/video.c | 2 |
2 files changed, 0 insertions, 11 deletions
diff --git a/mpvcore/player/playloop.c b/mpvcore/player/playloop.c index d2c3904c77..650f164f05 100644 --- a/mpvcore/player/playloop.c +++ b/mpvcore/player/playloop.c @@ -172,12 +172,6 @@ static void seek_reset(struct MPContext *mpctx, bool reset_ao) if (mpctx->d_video) { video_reset_decoding(mpctx->d_video); vo_seek_reset(mpctx->video_out); - if (mpctx->d_video->vf_initialized == 1) - vf_chain_seek_reset(mpctx->d_video->vfilter); - mpctx->d_video->num_buffered_pts = 0; - mpctx->d_video->last_pts = MP_NOPTS_VALUE; - mpctx->d_video->last_packet_pdts = MP_NOPTS_VALUE; - mpctx->d_video->pts = MP_NOPTS_VALUE; mpctx->video_pts = MP_NOPTS_VALUE; mpctx->delay = 0; mpctx->time_frame = 0; @@ -185,11 +179,8 @@ static void seek_reset(struct MPContext *mpctx, bool reset_ao) if (mpctx->d_audio) { audio_reset_decoding(mpctx->d_audio); - if (mpctx->d_audio->afilter) - af_control_all(mpctx->d_audio->afilter, AF_CONTROL_RESET, NULL); if (reset_ao) clear_audio_output_buffers(mpctx); - clear_audio_decode_buffers(mpctx); } reset_subtitles(mpctx); diff --git a/mpvcore/player/video.c b/mpvcore/player/video.c index 65343cfa58..a9dffaf6e9 100644 --- a/mpvcore/player/video.c +++ b/mpvcore/player/video.c @@ -118,8 +118,6 @@ int reinit_video_chain(struct MPContext *mpctx) struct dec_video *d_video = talloc_zero(NULL, struct dec_video); mpctx->d_video = d_video; - d_video->last_pts = MP_NOPTS_VALUE; - d_video->last_packet_pdts = MP_NOPTS_VALUE; d_video->opts = mpctx->opts; d_video->header = sh; d_video->fps = sh->video->fps; |