diff options
| author | Niklas Haas <git@haasn.xyz> | 2017-07-01 03:32:14 +0200 |
|---|---|---|
| committer | Niklas Haas <git@haasn.xyz> | 2017-07-01 03:32:14 +0200 |
| commit | 2f41c4e81b34cc8085f25a9bf016c2b98cd70cd7 (patch) | |
| tree | a94b291af88e0d7caef4ed7afb3560b5d21966fa /video | |
| parent | 6a12b1fdc3c5c70fed15734c02f65005db2835cd (diff) | |
| download | mpv-2f41c4e81b34cc8085f25a9bf016c2b98cd70cd7.tar.bz2 mpv-2f41c4e81b34cc8085f25a9bf016c2b98cd70cd7.tar.xz | |
vo_opengl: call pass_info_reset earlier
Omitting this call resulted in a crash when has_frame was false. But we
can just call it way earlier, because there's really no reason not to.
Diffstat (limited to 'video')
| -rw-r--r-- | video/out/opengl/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c index ac0685a645..6a9cbac042 100644 --- a/video/out/opengl/video.c +++ b/video/out/opengl/video.c @@ -2748,6 +2748,7 @@ static void gl_video_interpolate_frame(struct gl_video *p, struct vo_frame *t, void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo) { GL *gl = p->gl; + pass_info_reset(p, false); if (fbo && !(gl->mpgl_caps & MPGL_CAP_FB)) { MP_FATAL(p, "Rendering to FBO requested, but no FBO extension found!\n"); @@ -2824,7 +2825,6 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo) if (is_new || !p->output_fbo_valid) { p->output_fbo_valid = false; - pass_info_reset(p, false); if (!pass_render_frame(p, frame->current, frame->frame_id)) goto done; |