vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Dec 10 20:34:42 2018 +0200| [45fe919a614085f1b0256d305ac41d1f8b96fb8a] | committer: Rémi Denis-Courmont
caca: remove redundant pool callback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=45fe919a614085f1b0256d305ac41d1f8b96fb8a --- modules/video_output/caca.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c index 4c7abfed67..1dfdc49f68 100644 --- a/modules/video_output/caca.c +++ b/modules/video_output/caca.c @@ -37,7 +37,6 @@ #include <vlc_block.h> #include <vlc_plugin.h> #include <vlc_vout_display.h> -#include <vlc_picture_pool.h> #if !defined(_WIN32) && !defined(__APPLE__) # ifdef X_DISPLAY_MISSING # error Xlib required due to XInitThreads @@ -53,7 +52,6 @@ struct vout_display_sys_t { caca_display_t *dp; cucul_dither_t *dither; - picture_pool_t *pool; block_fifo_t *fifo; vlc_thread_t thread; vout_window_t *window; @@ -92,18 +90,6 @@ static void VoutDisplayEventKey(vout_display_sys_t *sys, int key) } /** - * Return a pool of direct buffers - */ -static picture_pool_t *Pool(vout_display_t *vd, unsigned count) -{ - vout_display_sys_t *sys = vd->sys; - - if (!sys->pool) - sys->pool = picture_pool_NewFromFormat(&vd->fmt, count); - return sys->pool; -} - -/** * Compute the place in canvas unit. */ static void Place(vout_display_t *vd, const vout_display_cfg_t *cfg) @@ -488,7 +474,6 @@ static int Open(vlc_object_t *object) /* Setup vout_display now that everything is fine */ *fmtp = fmt; - vd->pool = Pool; vd->prepare = Prepare; vd->display = PictureDisplay; vd->control = Control; @@ -502,8 +487,6 @@ static int Open(vlc_object_t *object) error: if (sys) { - if (sys->pool) - picture_pool_Release(sys->pool); if (sys->dither) cucul_free_dither(sys->dither); if (sys->dp) @@ -532,8 +515,6 @@ static void Close(vlc_object_t *object) vlc_join(sys->thread, NULL); block_FifoRelease(sys->fifo); } - if (sys->pool) - picture_pool_Release(sys->pool); if (sys->dither) cucul_free_dither(sys->dither); caca_free_display(sys->dp); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
