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

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.
This commit is contained in:
Niklas Haas 2017-07-01 03:32:14 +02:00
parent 6a12b1fdc3
commit 2f41c4e81b
No known key found for this signature in database
GPG Key ID: 9A09076581B27402
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
video/out/opengl/video.c
View File

@ -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) void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo)
{ {
GL *gl = p->gl; GL *gl = p->gl;
pass_info_reset(p, false);
if (fbo && !(gl->mpgl_caps & MPGL_CAP_FB)) { if (fbo && !(gl->mpgl_caps & MPGL_CAP_FB)) {
MP_FATAL(p, "Rendering to FBO requested, but no FBO extension found!\n"); 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) { if (is_new || !p->output_fbo_valid) {
p->output_fbo_valid = false; p->output_fbo_valid = false;
pass_info_reset(p, false);
if (!pass_render_frame(p, frame->current, frame->frame_id)) if (!pass_render_frame(p, frame->current, frame->frame_id))
goto done; goto done;