[vlc-commits] android/display: fix invalid pointer aliasing

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jan  5 14:26:18 2018 +0100| [7165259270647ed56ed4a40cdcd155e922a1f964] | committer: Thomas Guillem

android/display: fix invalid pointer aliasing

Pointed-out-by: Zhao Zhili <quinkblack at foxmail.com>
(cherry picked from commit b517819eb05dcd9ae832f4c9c13d0e4d996956af)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 modules/video_output/android/display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index a5b9c39738..2f6b8178d1 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -479,7 +479,7 @@ error:
     }
     p_window->b_use_priv = false;
     if (p_window->i_angle != 0)
-        video_format_ApplyRotation(&p_window->fmt, &p_window->fmt);
+        video_format_TransformTo(&p_window->fmt, ORIENT_NORMAL);
     return -1;
 }
 
@@ -729,7 +729,7 @@ static int OpenCommon(vout_display_t *vd)
 
     /* use software rotation if we don't use private anw */
     if (!sys->p_window->b_opaque && !sys->p_window->b_use_priv)
-        video_format_ApplyRotation(&vd->fmt, &vd->fmt);
+        video_format_TransformTo(&vd->fmt, ORIENT_NORMAL);
 
     msg_Dbg(vd, "using %s", sys->p_window->b_opaque ? "opaque" :
             (sys->p_window->b_use_priv ? "ANWP" : "ANW"));