vlc | branch: master | Thomas Guillem <[email protected]> | Fri Nov 21 10:48:49 2014 +0100| [5a5ce58af89356b7615a302ce2f14ce6a8e484d8] | committer: Jean-Baptiste Kempf
nativewindowpriv: lockBuffer not needed after jbmr2 Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a5ce58af89356b7615a302ce2f14ce6a8e484d8 --- modules/video_output/android/nativewindowpriv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/video_output/android/nativewindowpriv.c b/modules/video_output/android/nativewindowpriv.c index e5f8812..626f117 100644 --- a/modules/video_output/android/nativewindowpriv.c +++ b/modules/video_output/android/nativewindowpriv.c @@ -244,18 +244,16 @@ int ANativeWindowPriv_dequeue( native_window_priv *priv, void **pp_handle ) int ANativeWindowPriv_lock( native_window_priv *priv, void *p_handle ) { +#if !ANDROID_JBMR2_OR_LATER ANativeWindowBuffer_t *anb = (ANativeWindowBuffer_t *)p_handle; status_t err = NO_ERROR; CHECK_ANB(); -#if ANDROID_JBMR2_OR_LATER - err = priv->anw->lockBuffer_DEPRECATED( priv->anw, anb ); -#else err = priv->anw->lockBuffer( priv->anw, anb ); -#endif CHECK_ERR(); +#endif return 0; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
