[vlc-commits] nativewindowpriv: don't connect before ics

Thomas Guillem git at videolan.org
Mon Nov 17 14:49:57 CET 2014


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov 17 14:43:26 2014 +0100| [46b36fbafbf9cf67b29ec8efca26bd4a408aa7e0] | committer: Jean-Baptiste Kempf

nativewindowpriv: don't connect before ics

This broke direct rendering on honeycomb.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/video_output/android/nativewindowpriv.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/video_output/android/nativewindowpriv.c b/modules/video_output/android/nativewindowpriv.c
index 3c382bb..989236a 100644
--- a/modules/video_output/android/nativewindowpriv.c
+++ b/modules/video_output/android/nativewindowpriv.c
@@ -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
 }
 



More information about the vlc-commits mailing list