]> git.sesse.net Git - vlc/commitdiff
nativewindowpriv: use set_buffers_user_dimensions after jbmr2
authorThomas Guillem <thomas@gllm.fr>
Fri, 21 Nov 2014 09:48:47 +0000 (10:48 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 21 Nov 2014 10:11:28 +0000 (11:11 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/video_output/android/nativewindowpriv.c

index 3632a89fcd902935139f94ea4b13503991a5ac76..48c3e75f5ae9acdc570bd8c9ca470cb725b7361f 100644 (file)
@@ -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 );