]> git.sesse.net Git - vlc/commitdiff
nativewindowpriv: don't connect before ics
authorThomas Guillem <thomas@gllm.fr>
Mon, 17 Nov 2014 13:43:26 +0000 (14:43 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Mon, 17 Nov 2014 13:49:48 +0000 (14:49 +0100)
This broke direct rendering on honeycomb.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/video_output/android/nativewindowpriv.c

index 3c382bb8710c29bfa52e488e74ff36b9565b74d9..989236a594e277d4c542539c5f9e185a59d242fe 100644 (file)
@@ -81,8 +81,6 @@ static int window_connect( ANativeWindow *anw )
 {
 #if ANDROID_API >= 14
     return native_window_api_connect( anw, NATIVE_WINDOW_API_MEDIA );
-#else
-    return native_window_connect( anw, NATIVE_WINDOW_API_EGL );
 #endif
 }
 
@@ -90,8 +88,6 @@ static int window_disconnect( ANativeWindow *anw )
 {
 #if ANDROID_API >= 14
     return native_window_api_disconnect( anw, NATIVE_WINDOW_API_MEDIA );
-#else
-    return native_window_disconnect( anw, NATIVE_WINDOW_API_EGL );
 #endif
 }