Skip to content

V
vlc
Commit 0ec926a3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

android: check that the vout is not windowed

parent 6bf3a80f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/video_output/android/opaque.c
View file @ 0ec926a3
...@@ -176,6 +176,8 @@ static int Open(vlc_object_t *p_this) ...@@ -176,6 +176,8 @@ static int Open(vlc_object_t *p_this)
if (fmt.i_chroma != VLC_CODEC_ANDROID_OPAQUE) if (fmt.i_chroma != VLC_CODEC_ANDROID_OPAQUE)
return VLC_EGENERIC; return VLC_EGENERIC;
if (vout_display_IsWindowed(vd))
return VLC_EGENERIC;
/* Allocate structure */ /* Allocate structure */
vout_display_sys_t *sys = (struct vout_display_sys_t*)calloc(1, sizeof(*sys)); vout_display_sys_t *sys = (struct vout_display_sys_t*)calloc(1, sizeof(*sys));
......
modules/video_output/android/surface.c
View file @ 0ec926a3
...@@ -180,6 +180,8 @@ static int Open(vlc_object_t *p_this) ...@@ -180,6 +180,8 @@ static int Open(vlc_object_t *p_this)
if (fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE) if (fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE)
return VLC_EGENERIC; return VLC_EGENERIC;
if (vout_display_IsWindowed(vd))
return VLC_EGENERIC;
/* */ /* */
if (vlc_mutex_trylock(&single_instance) != 0) { if (vlc_mutex_trylock(&single_instance) != 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment