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

vo: get rid of config_count field 

Doesn't really seem to be much of use. Get rid of the remaining uses of
it.

Concerning vo_opengl_old, it seems uninitGl() works fine even if called
before initialization.
This commit is contained in:
wm4 2014-05-06 00:21:15 +02:00
parent a8b267540e
commit 143cf79a96
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
video/out/vo.c
View File

@ -339,7 +339,6 @@ int vo_reconfig(struct vo *vo, struct mp_image_params *params, int flags)
int ret = vo->driver->reconfig(vo, vo->params, flags);
vo->config_ok = ret >= 0;
vo->config_count += vo->config_ok;
if (vo->config_ok) {
check_vo_caps(vo);
} else {

1
video/out/vo.h
View File

@ -230,7 +230,6 @@ struct vo_driver {
struct vo {
struct mp_log *log; // Using e.g. "[vo/vdpau]" as prefix
int config_ok; // Last config call was successful?
int config_count; // Total number of successful config calls
struct mp_image_params *params; // Configured parameters (as in vo_reconfig)
bool probing;

7
video/out/vo_image.c
View File

@ -69,10 +69,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
struct priv *p = vo->priv;
mp_image_unrefp(&p->current);
if (p->outdir && vo->config_count < 1)
if (!checked_mkdir(vo, p->outdir))
return -1;
return 0;
}
@ -127,6 +123,9 @@ static void uninit(struct vo *vo)
static int preinit(struct vo *vo)
{
struct priv *p = vo->priv;
if (p->outdir && !checked_mkdir(vo, p->outdir))
return -1;
vo->untimed = true;
return 0;
}

3
video/out/vo_opengl_old.c
View File

@ -1731,8 +1731,7 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
p->vo_flipped = !!(flags & VOFLAG_FLIPPING);
if (vo->config_count)
uninitGl(vo);
uninitGl(vo);
if (!config_window(vo, vo->dwidth, vo->dheight, flags))
return -1;