vlc | branch: master | Steve Lhomme <[email protected]> | Wed Jul 31 14:16:22 2019 +0200| [bcdb8a71d8117b6fd575ee7e7cbb62152c931cd6] | committer: Steve Lhomme
video_output: remove unused vout_Cancel > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bcdb8a71d8117b6fd575ee7e7cbb62152c931cd6 --- src/video_output/video_output.c | 12 ------------ src/video_output/vout_internal.h | 6 ------ 2 files changed, 18 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index cac94bac1a..8aa527120c 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1622,18 +1622,6 @@ error: return VLC_EGENERIC; } -void vout_Cancel(vout_thread_t *vout, bool canceled) -{ - vout_thread_sys_t *sys = vout->p; - assert(!sys->dummy); - assert(sys->display); - - vout_control_Hold(&sys->control); - if (sys->display_pool != NULL) - picture_pool_Cancel(sys->display_pool, canceled); - vout_control_Release(&sys->control); -} - static void ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd) { switch(cmd.type) { diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 22c90c07a2..f8b3c3980c 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -333,12 +333,6 @@ void vout_MouseState(vout_thread_t *, const vlc_mouse_t *); void vout_GetResetStatistic( vout_thread_t *p_vout, unsigned *pi_displayed, unsigned *pi_lost ); -/* - * Cancel the vout, if cancel is true, it won't return any pictures after this - * call. - */ -void vout_Cancel( vout_thread_t *p_vout, bool b_canceled ); - /** * This function will force to display the next picture while paused */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
