[vlc-commits] nativewindowpriv: use set_buffers_user_dimensions after jbmr2

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Nov 21 10:48:47 2014 +0100| [f04fe95fd1c6634f54028d1b93c402204502a8ff] | committer: Jean-Baptiste Kempf

nativewindowpriv: use set_buffers_user_dimensions after jbmr2

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

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

 modules/video_output/android/nativewindowpriv.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/video_output/android/nativewindowpriv.c b/modules/video_output/android/nativewindowpriv.c
index 3632a89..48c3e75 100644
--- a/modules/video_output/android/nativewindowpriv.c
+++ b/modules/video_output/android/nativewindowpriv.c
@@ -158,7 +158,11 @@ int ANativeWindowPriv_setup( native_window_priv *priv, int w, int h, int hal_for
     err = native_window_set_buffers_format( priv->anw, hal_format );
     CHECK_ERR();
 
+#if ANDROID_JBMR2_OR_LATER
+    err = native_window_set_buffers_user_dimensions( priv->anw, w, h );
+#else
     err = native_window_set_buffers_dimensions( priv->anw, w, h );
+#endif
     CHECK_ERR();
 
     err = native_window_set_scaling_mode( priv->anw, NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW );