Merge pull request #907 from mprobinson/master

Show image frame before BFI black frame
This commit is contained in:
Twinaphex 2014-08-28 19:13:24 +02:00
commit 120679e43e

View File

@ -1571,13 +1571,6 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
glClear(GL_COLOR_BUFFER_BIT);
// Disable BFI during fast forward to prevent flicker
if (g_settings.video.black_frame_insertion && !driver.nonblock_state)
{
context_swap_buffers_func(gl);
glClear(GL_COLOR_BUFFER_BIT);
}
if (gl->shader && gl->shader->set_params)
gl->shader->set_params(gl, width, height,
gl->tex_w, gl->tex_h,
@ -1651,6 +1644,13 @@ static bool gl_frame(void *data, const void *frame, unsigned width, unsigned hei
#endif
#endif
// Disable BFI during fast forward to prevent flicker
if (g_settings.video.black_frame_insertion && !driver.nonblock_state)
{
context_swap_buffers_func(gl);
glClear(GL_COLOR_BUFFER_BIT);
}
context_swap_buffers_func(gl);
g_extern.frame_count++;