From f6a19da73702672857fbc5cdefe649fac8a50c03 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 26 Nov 2011 22:16:47 +0200
Subject: [PATCH] mplayer: omapfb: fix ?res_virtual confusion

this is needed for double buffering to function properly
---
 recipes/mplayer/files/vo_omapfb.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes/mplayer/files/vo_omapfb.c b/recipes/mplayer/files/vo_omapfb.c
index cb4daff946..a3efc23e47 100644
--- a/recipes/mplayer/files/vo_omapfb.c
+++ b/recipes/mplayer/files/vo_omapfb.c
@@ -263,8 +263,8 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
         getPrimaryPlaneInfo();
 
     if ( (!x && !y && !out_w && !out_h) ||
-        (out_w < sinfo.xres_virtual / 4) || (out_h < sinfo.yres_virtual / 4) ||  /* HW can't scale down by more than 4x */
-        (out_w > sinfo.xres_virtual * 8) || (out_h > sinfo.yres_virtual * 8) ) { /* HW can't scale up by more than 8x */
+        (out_w < sinfo.xres / 4) || (out_h < sinfo.yres / 4) ||  /* HW can't scale down by more than 4x */
+        (out_w > sinfo.xres * 8) || (out_h > sinfo.yres * 8) ) { /* HW can't scale up by more than 8x */
         pinfo.enabled = 0;
         pinfo.pos_x = 0;
         pinfo.pos_y = 0;
@@ -272,8 +272,8 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
         return;
     }
 
-    xres = sinfo.xres_virtual;
-    yres = sinfo.yres_virtual;
+    xres = sinfo.xres;
+    yres = sinfo.yres;
 
     /* Handle clipping: if the left or top edge of the window goes
      * offscreen, clamp the overlay to the left or top edge of the
@@ -290,9 +290,9 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
     if (x < 0) {
         /* clamp to left edge */
         xoff = -x;
-        if (out_w != sinfo.xres_virtual) {
+        if (out_w != sinfo.xres) {
             /* account for scaling */
-            xoff *= sinfo.xres_virtual;
+            xoff *= sinfo.xres;
             xoff /= out_w;
         }
         xres -= xoff;
@@ -303,9 +303,9 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
         if (x + out_w > sinfo_p0.xres) {
             /* clamp to right edge */
             int diff = sinfo_p0.xres - x;
-            if (out_w != sinfo.xres_virtual) {
+            if (out_w != sinfo.xres) {
                 /* account for scaling */
-                xres = diff * sinfo.xres_virtual;
+                xres = diff * sinfo.xres;
                 xres /= out_w;
             } else {
                 xres = diff;
@@ -319,9 +319,9 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
          * titlebar is usually forced to stay visible
          */
         yoff = -y;
-        if (out_h != sinfo.yres_virtual) {
+        if (out_h != sinfo.yres) {
             /* account for scaling */
-            yoff *= sinfo.yres_virtual;
+            yoff *= sinfo.yres;
             yoff /= out_h;
         }
         yres -= yoff;
@@ -332,9 +332,9 @@ static void omapfb_update(int x, int y, int out_w, int out_h, int show)
         if (y + out_h > sinfo_p0.yres) {
             /* clamp to bottom edge */
             int diff = sinfo_p0.yres - y;
-            if (out_h != sinfo.yres_virtual) {
+            if (out_h != sinfo.yres) {
                 /* account for scaling */
-                yres = diff * sinfo.yres_virtual;
+                yres = diff * sinfo.yres;
                 yres /= out_h;
             } else {
                 yres = diff;
-- 
2.39.5