[vlc-commits] flaschen: remove redundant pool callback

Rémi Denis-Courmont git at videolan.org
Mon Dec 10 20:10:33 CET 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 10 20:34:42 2018 +0200| [0618cebf774b5136dd71ea9c21c9451722dd6bb0] | committer: Rémi Denis-Courmont

flaschen: remove redundant pool callback

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0618cebf774b5136dd71ea9c21c9451722dd6bb0
---

 modules/video_output/flaschen.c | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c
index a87d8ed103..9223319afd 100644
--- a/modules/video_output/flaschen.c
+++ b/modules/video_output/flaschen.c
@@ -78,10 +78,7 @@ vlc_module_end ()
  *****************************************************************************/
 struct vout_display_sys_t {
     int             fd;
-
-    picture_pool_t *pool;
 };
-static picture_pool_t *Pool(vout_display_t *, unsigned count);
 static void            Display(vout_display_t *, picture_t *);
 static int             Control(vout_display_t *, int, va_list);
 
@@ -98,7 +95,6 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
     vd->sys = sys = calloc(1, sizeof(*sys));
     if (!sys)
         return VLC_ENOMEM;
-    sys->pool = NULL;
     sys->fd = -1;
 
     /* */
@@ -143,7 +139,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;
@@ -156,21 +151,10 @@ static void Close(vout_display_t *vd)
 {
     vout_display_sys_t *sys = vd->sys;
 
-    if (sys->pool)
-        picture_pool_Release(sys->pool);
-
     net_Close(sys->fd);
     free(sys);
 }
 
-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)
 {
 #ifdef IOV_MAX



More information about the vlc-commits mailing list