[vlc-commits] android_window: set i_angle for anw too

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Nov 25 16:17:22 2014 +0100| [347926827a47131f490f3616a42a3ee8b21637c0] | committer: Jean-Baptiste Kempf

android_window: set i_angle for anw too

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

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

 modules/video_output/android/android_window.c |   34 ++++++++++++-------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c
index 5effdd9..587f244 100644
--- a/modules/video_output/android/android_window.c
+++ b/modules/video_output/android/android_window.c
@@ -254,25 +254,24 @@ static android_window *AndroidWindow_New(vout_display_sys_t *sys,
         }
     }
 
-    if (p_window->b_use_priv) {
-        switch (p_fmt->orientation)
-        {
-            case ORIENT_ROTATED_90:
-                p_window->i_angle = 90;
-                break;
-            case ORIENT_ROTATED_180:
-                p_window->i_angle = 180;
-                break;
-            case ORIENT_ROTATED_270:
-                p_window->i_angle = 270;
-                break;
-            default:
-                p_window->i_angle = 0;
-        }
+    switch (p_fmt->orientation)
+    {
+        case ORIENT_ROTATED_90:
+            p_window->i_angle = 90;
+            break;
+        case ORIENT_ROTATED_180:
+            p_window->i_angle = 180;
+            break;
+        case ORIENT_ROTATED_270:
+            p_window->i_angle = 270;
+            break;
+        default:
+            p_window->i_angle = 0;
+    }
+    if (p_window->b_use_priv)
         p_window->fmt = *p_fmt;
-    } else {
+    else
         video_format_ApplyRotation(&p_window->fmt, p_fmt);
-    }
     p_window->i_pic_count = 1;
     return p_window;
 }
@@ -375,7 +374,6 @@ error:
     p_window->b_use_priv = false;
     if (p_window->i_angle != 0)
         video_format_ApplyRotation(&p_window->fmt, &p_window->fmt);
-    p_window->i_angle = 0;
     return -1;
 }