summaryrefslogtreecommitdiffstats
path: root/video/out/vo_opengl.c
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-03-04 22:41:27 +0100
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-03-04 23:32:47 +0100
commit1198c031e4233a0cff5aa7d24aab986163f6903a (patch)
treebff49197908452f3ad1363edcf4c527db9bf1fe0 /video/out/vo_opengl.c
parent4949992264d78d6dd22c0f6c611850402fd6eb30 (diff)
downloadmpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.bz2
mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.xz
vo: Separate vo options from MPOpts
Separate the video output options from the big MPOpts structure and also only pass the new mp_vo_opts structure to the vo backend. Move video_driver_list into mp_vo_opts
Diffstat (limited to 'video/out/vo_opengl.c')
-rw-r--r--video/out/vo_opengl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 6170852132..dbaede4461 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -1794,7 +1794,7 @@ static struct bstr load_file(struct gl_priv *p, void *talloc_ctx,
const char *filename)
{
struct bstr res = {0};
- stream_t *s = open_stream(filename, p->vo->opts, NULL);
+ stream_t *s = open_stream(filename, NULL, NULL);
if (s) {
res = stream_read_complete(s, talloc_ctx, 1000000000, 0);
free_stream(s);
@@ -2085,7 +2085,7 @@ static int preinit(struct vo *vo, const char *arg)
.colorspace = MP_CSP_DETAILS_DEFAULTS,
.use_npot = 1,
.use_pbo = hq,
- .swap_interval = vo->opts->vo.vsync,
+ .swap_interval = vo->opts->vsync,
.dither_depth = hq ? 0 : -1,
.fbo_format = hq ? GL_RGB16 : GL_RGB,
.use_scale_sep = 1,