RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vf_vo: Use vo_seek_reset() instead of vo_control() 

Change the vo_control(vo, VOCTRL_RESET, NULL) call done when the vf_vo
filter is uninited to vo_seek_reset(vo). The latter also sets
vo->frame_loaded to false.

Remove the vo->config_ok check from vo_seek_reset(). The reset call
should be doable even if config failed.
This commit is contained in:
Uoti Urpala 2009-12-02 12:50:56 +02:00
parent de11a44bba
commit 7044965988
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpcodecs/vf_vo.c
View File

@ -203,7 +203,7 @@ static void uninit(struct vf_instance* vf)
if (vf->priv) {
/* Allow VO (which may live on to work with another instance of vf_vo)
* to get rid of numbered-mpi references that will now be invalid. */
vo_control(video_out, VOCTRL_RESET, NULL);
vo_seek_reset(video_out);
#ifdef CONFIG_ASS
if (vf->priv->ass_priv)
ass_renderer_done(vf->priv->ass_priv);

2
libvo/video_out.c
View File

@ -354,8 +354,6 @@ void vo_check_events(struct vo *vo)
void vo_seek_reset(struct vo *vo)
{
if (!vo->config_ok)
return;
vo_control(vo, VOCTRL_RESET, NULL);
vo->frame_loaded = false;
}

1
mencoder.c
View File

@ -205,6 +205,7 @@ int vo_config(struct vo *vo, uint32_t width, uint32_t height,
uint32_t d_width, uint32_t d_height, uint32_t flags,
char *title, uint32_t format) { abort(); }
int vo_control(struct vo *vo, uint32_t request, void *data) { abort(); }
void vo_seek_reset(struct vo *vo) { abort(); }
int vo_draw_image(struct vo *vo, struct mp_image *mpi, double pts) { abort(); }
int vo_draw_frame(struct vo *vo, uint8_t *src[]) { abort(); }
int vo_draw_slice(struct vo *vo, uint8_t *src[], int stride[], int w, int h, int x, int y) { abort(); }