vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Dec 9 12:50:59 2018 +0200| [0bdc25b4cd9726b197ab11daacee5ac9021ba806] | committer: Rémi Denis-Courmont
vout: merge vout_EndWrapper() and vout_CloseWrapper() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0bdc25b4cd9726b197ab11daacee5ac9021ba806 --- src/video_output/video_output.c | 4 +--- src/video_output/vout_internal.h | 1 - src/video_output/vout_wrapper.c | 10 +--------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 0fa136b454..d00a7e2b71 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1487,10 +1487,8 @@ static void ThreadStop(vout_thread_t *vout, vout_display_cfg_t *cfg) /* Destroy translation tables */ if (vout->p->display.vd) { - if (vout->p->decoder_pool) { + if (vout->p->decoder_pool) ThreadFlush(vout, true, INT64_MAX); - vout_EndWrapper(vout); - } vout_CloseWrapper(vout, cfg); } diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index a696549425..b5b11c40f8 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -216,7 +216,6 @@ void vout_IntfReinit( vout_thread_t * ); /* */ int vout_OpenWrapper(vout_thread_t *, const char *, vout_display_cfg_t *); void vout_CloseWrapper(vout_thread_t *, vout_display_cfg_t *); -void vout_EndWrapper(vout_thread_t *); void vout_ManageWrapper(vout_thread_t *); /* */ diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c index c151d42391..8a723c5e2b 100644 --- a/src/video_output/vout_wrapper.c +++ b/src/video_output/vout_wrapper.c @@ -144,7 +144,7 @@ error: /***************************************************************************** * *****************************************************************************/ -void vout_EndWrapper(vout_thread_t *vout) +void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg) { vout_thread_sys_t *sys = vout->p; @@ -154,14 +154,6 @@ void vout_EndWrapper(vout_thread_t *vout) if (sys->decoder_pool != sys->display_pool) picture_pool_Release(sys->decoder_pool); -} - -/***************************************************************************** - * - *****************************************************************************/ -void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg) -{ - vout_thread_sys_t *sys = vout->p; #ifdef _WIN32 var_DelCallback(vout, "video-wallpaper", Forward, NULL); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
