[vlc-commits] Linux FB: check that the vout is not windowed

Rémi Denis-Courmont git at videolan.org
Thu Oct 16 19:26:12 CEST 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 14 22:42:47 2014 +0300| [6d07b5e4bcaddfe7ad08d373b1a586d8e0c964bc] | committer: Rémi Denis-Courmont

Linux FB: check that the vout is not windowed

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

 modules/video_output/fb.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index a2d9a57..a0a77f9 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -179,6 +179,9 @@ static int Open(vlc_object_t *object)
     vout_display_t     *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;
+
     /* Allocate instance and initialize some members */
     vd->sys = sys = calloc(1, sizeof(*sys));
     if (!sys)
@@ -254,7 +257,6 @@ static int Open(vlc_object_t *object)
         Close(VLC_OBJECT(vd));
         return VLC_EGENERIC;
     }
-    vout_display_DeleteWindow(vd, NULL);
 
     /* */
     video_format_t fmt;



More information about the vlc-commits mailing list