vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Dec 10 20:34:42 2018 +0200| [21ee68413bdbb32692cacdf69b7a55a920a88635] | committer: Rémi Denis-Courmont
fb: remove redundant pool callback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21ee68413bdbb32692cacdf69b7a55a920a88635 --- modules/video_output/fb.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 7868aa97eb..46d04bc7d3 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -45,7 +45,6 @@ #include <vlc_common.h> #include <vlc_plugin.h> #include <vlc_vout_display.h> -#include <vlc_picture_pool.h> #include <vlc_fs.h> /***************************************************************************** @@ -96,7 +95,6 @@ vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ -static picture_pool_t *Pool (vout_display_t *, unsigned); static void Display(vout_display_t *, picture_t *); static int Control(vout_display_t *, int, va_list); @@ -146,7 +144,6 @@ struct vout_display_sys_t { size_t video_size; /* page size */ picture_t *picture; - picture_pool_t *pool; }; @@ -245,7 +242,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, /* */ sys->video_ptr = MAP_FAILED; sys->picture = NULL; - sys->pool = NULL; if (OpenDisplay(vd, force_resolution)) { Close(vd); @@ -298,7 +294,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, /* */ *fmtp = fmt; - vd->pool = Pool; vd->prepare = NULL; vd->display = Display; vd->control = Control; @@ -314,9 +309,7 @@ static void Close(vout_display_t *vd) { vout_display_sys_t *sys = vd->sys; - if (sys->pool) - picture_pool_Release(sys->pool); - else if (sys->picture != NULL) + if (sys->picture != NULL) picture_Release(sys->picture); CloseDisplay(vd); @@ -328,15 +321,6 @@ static void Close(vout_display_t *vd) } /* */ -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; -} static void Display(vout_display_t *vd, picture_t *picture) { vout_display_sys_t *sys = vd->sys; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
