summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-27 20:54:29 +0100
committerwm4 <wm4@nowhere>2013-11-27 21:14:39 +0100
commit1e96f5bcd98f41fa11d87f1a5236468f985327a9 (patch)
tree34d0de4c79fdd9023415f4d5bfe2380ae7bd55c5 /video
parentf09b2ff661040828e2b17fad89613f7706b10e7d (diff)
downloadmpv-1e96f5bcd98f41fa11d87f1a5236468f985327a9.tar.bz2
mpv-1e96f5bcd98f41fa11d87f1a5236468f985327a9.tar.xz
Move some code from player to audio/video reset functions
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index 497ae56a02..b073173104 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -59,8 +59,14 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
void video_reset_decoding(struct dec_video *d_video)
{
video_vd_control(d_video, VDCTRL_RESET, NULL);
+ if (d_video->vf_initialized == 1)
+ vf_chain_seek_reset(d_video->vfilter);
d_video->prev_codec_reordered_pts = MP_NOPTS_VALUE;
d_video->prev_sorted_pts = MP_NOPTS_VALUE;
+ d_video->num_buffered_pts = 0;
+ d_video->last_pts = MP_NOPTS_VALUE;
+ d_video->last_packet_pdts = MP_NOPTS_VALUE;
+ d_video->pts = MP_NOPTS_VALUE;
}
int video_vd_control(struct dec_video *d_video, int cmd, void *arg)
@@ -165,6 +171,7 @@ static const struct vd_functions *find_driver(const char *name)
bool video_init_best_codec(struct dec_video *d_video, char* video_decoders)
{
assert(!d_video->vd_driver);
+ video_reset_decoding(d_video);
struct mp_decoder_entry *decoder = NULL;
struct mp_decoder_list *list =