Commit 9f5c45fa authored by Martin Storsjö's avatar Martin Storsjö
Browse files

androidsurface: Release the ANativeWindow before closing the dlopened library



This fixes ANativeWindow usage on 2.3 and 3.x. Therefore, revert
back to preferring ANativeWindow over the private symbols.
Signed-off-by: Martin Storsjö's avatarMartin Storsjö <martin@martin.st>
parent 7c52aacb
...@@ -219,9 +219,9 @@ static int Open(vlc_object_t *p_this) ...@@ -219,9 +219,9 @@ static int Open(vlc_object_t *p_this)
} }
/* */ /* */
sys->p_library = InitLibrary(sys); sys->p_library = InitLibrary2(sys);
if (!sys->p_library) if (!sys->p_library)
sys->p_library = InitLibrary2(sys); sys->p_library = InitLibrary(sys);
if (!sys->p_library) { if (!sys->p_library) {
free(sys); free(sys);
msg_Err(vd, "Could not initialize libandroid.so/libui.so/libgui.so/libsurfaceflinger_client.so!"); msg_Err(vd, "Could not initialize libandroid.so/libui.so/libgui.so/libsurfaceflinger_client.so!");
...@@ -323,9 +323,9 @@ static void Close(vlc_object_t *p_this) ...@@ -323,9 +323,9 @@ static void Close(vlc_object_t *p_this)
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
picture_pool_Delete(sys->pool); picture_pool_Delete(sys->pool);
dlclose(sys->p_library);
if (sys->window) if (sys->window)
sys->s_winRelease(sys->window); sys->s_winRelease(sys->window);
dlclose(sys->p_library);
free(sys); free(sys);
vlc_mutex_unlock(&single_instance); vlc_mutex_unlock(&single_instance);
} }
......
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