Skip to content

V
vlc
Commit 5a5ce58a authored by Thomas Guillem's avatar Thomas Guillem Committed by Jean-Baptiste Kempf
Browse files
Options

nativewindowpriv: lockBuffer not needed after jbmr2 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 5172eb8d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/video_output/android/nativewindowpriv.c
View file @ 5a5ce58a
...@@ -244,18 +244,16 @@ int ANativeWindowPriv_dequeue( native_window_priv *priv, void **pp_handle ) ...@@ -244,18 +244,16 @@ int ANativeWindowPriv_dequeue( native_window_priv *priv, void **pp_handle )
int ANativeWindowPriv_lock( native_window_priv *priv, void *p_handle ) int ANativeWindowPriv_lock( native_window_priv *priv, void *p_handle )
{ {
#if !ANDROID_JBMR2_OR_LATER
ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle;
status_t err = NO_ERROR; status_t err = NO_ERROR;
CHECK_ANB(); CHECK_ANB();
#if ANDROID_JBMR2_OR_LATER
err = priv->anw->lockBuffer_DEPRECATED( priv->anw, anb );
#else
err = priv->anw->lockBuffer( priv->anw, anb ); err = priv->anw->lockBuffer( priv->anw, anb );
#endif
CHECK_ERR(); CHECK_ERR();
#endif
return 0; return 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