[MPlayer-cvslog] r34866 - trunk/sub/spudec.c

[reimar]

Author: reimar
Date: Sun Apr 15 23:37:15 2012
New Revision: 34866

Log:
Ensure that the highlight disappears when switching
from DVD menu to playback.

Modified:
   trunk/sub/spudec.c

Modified: trunk/sub/spudec.c
==============================================================================
--- trunk/sub/spudec.c	Sun Apr 15 23:02:59 2012	(r34865)
+++ trunk/sub/spudec.c	Sun Apr 15 23:37:15 2012	(r34866)
@@ -273,11 +273,17 @@ static int apply_palette_crop(spudec_han
   uint8_t *src;
   uint16_t pal[4];
   unsigned stride = (crop_w + 7) & ~7;
+  int ret = 1;
   if (crop_x > this->pal_width || crop_y > this->pal_height ||
       crop_w > this->pal_width - crop_x || crop_h > this->pal_width - crop_y ||
       crop_w > 0x8000 || crop_h > 0x8000 ||
       stride * crop_h  > this->image_size) {
-    return 0;
+    // this might be an actual error or just signal that
+    // the highlight should be removed.
+    this->width = 0;
+    this->height = 0;
+    ret = 0;
+    goto out;
   }
   for (i = 0; i < 4; ++i) {
     int color;
@@ -304,6 +310,7 @@ static int apply_palette_crop(spudec_han
   this->start_row = this->pal_start_row + crop_y;
   spudec_cut_image(this);
 
+out:
   // reset scaled image
   this->scaled_frame_width = 0;
   this->scaled_frame_height = 0;