android: check that the vout is not windowed

diff --git a/modules/video_output/android/opaque.c b/modules/video_output/android/opaque.c
index 7c2866729ed2d4e6c2bc389d67da4e35c60ce36a..2fbe52645738ee28dc3533b0edd9f0ed4d1e2ffe 100644 (file)
--- 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 9ab2f53ee5df7dc18382c05808ee15261ead72cc..aa7d995ac30f190f584389710ea16b787c22efa0 100644 (file)
--- 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) {