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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 18:00:31 2014 +0300| [0ec926a33c88ddaf66955cbb0faaa8c6ab8b319e] | committer: Rémi Denis-Courmont

android: check that the vout is not windowed

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

 modules/video_output/android/opaque.c  |    2 ++
 modules/video_output/android/surface.c |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/video_output/android/opaque.c b/modules/video_output/android/opaque.c
index 7c28667..2fbe526 100644
--- a/modules/video_output/android/opaque.c
+++ b/modules/video_output/android/opaque.c
@@ -176,6 +176,8 @@ static int Open(vlc_object_t *p_this)
 
     if (fmt.i_chroma != VLC_CODEC_ANDROID_OPAQUE)
         return VLC_EGENERIC;
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;
 
     /* Allocate structure */
     vout_display_sys_t *sys = (struct vout_display_sys_t*)calloc(1, sizeof(*sys));
diff --git a/modules/video_output/android/surface.c b/modules/video_output/android/surface.c
index 9ab2f53..aa7d995 100644
--- a/modules/video_output/android/surface.c
+++ b/modules/video_output/android/surface.c
@@ -180,6 +180,8 @@ static int Open(vlc_object_t *p_this)
 
     if (fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE)
         return VLC_EGENERIC;
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;
 
     /* */
     if (vlc_mutex_trylock(&single_instance) != 0) {