vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Dec 26 13:54:57 2018 +0200| [4baa8e4c3e21a4058a213f70c1090f1de9f39b70] | committer: Rémi Denis-Courmont
vout: remove transitional use_copy flag > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4baa8e4c3e21a4058a213f70c1090f1de9f39b70 --- src/video_output/vout_internal.h | 1 - src/video_output/vout_wrapper.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 8726171368..940e73da6c 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -91,7 +91,6 @@ struct vout_thread_sys_t /* */ struct { vout_display_t *vd; - bool use_copy; } display; struct { diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c index 438927c476..a90d31afb9 100644 --- a/src/video_output/vout_wrapper.c +++ b/src/video_output/vout_wrapper.c @@ -96,11 +96,9 @@ int vout_OpenWrapper(vout_thread_t *vout, if (allow_dr && picture_pool_GetSize(display_pool) >= reserved_picture + decoder_picture) { - sys->display.use_copy = false; sys->dpb_size = picture_pool_GetSize(display_pool) - reserved_picture; sys->decoder_pool = display_pool; } else { - sys->display.use_copy = use_dr; sys->decoder_pool = decoder_pool = picture_pool_NewFromFormat(&vd->source, __MAX(VOUT_MAX_PICTURES, @@ -148,7 +146,7 @@ void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg) picture_pool_Release(sys->private_pool); - if (sys->display.use_copy || vout_IsDisplayFiltered(sys->display.vd)) + if (sys->display_pool != NULL || vout_IsDisplayFiltered(sys->display.vd)) picture_pool_Release(sys->decoder_pool); #ifdef _WIN32 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
