Merge svn changes up to r31211

The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.

2 files changed, 14 insertions, 5 deletions

diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index efec18564b..c52ceabb5d 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -503,12 +503,19 @@ static void autodetectGlExtensions(void) {
     ati_broken_pbo = ver && ver < 8395;
   }
   if (ati_hack      == -1) ati_hack      = ati_broken_pbo;
-  if (force_pbo     == -1 && extensions && strstr(extensions, "_pixel_buffer_object"))
-    force_pbo = is_ati;
-  if (use_rectangle == -1 && extensions && strstr(extensions, "_texture_non_power_of_two"))
+  if (force_pbo     == -1) {
+    force_pbo = 0;
+    if (extensions && strstr(extensions, "_pixel_buffer_object"))
+      force_pbo = is_ati;
+  }
+  if (use_rectangle == -1) {
     use_rectangle = 0;
-  if (use_rectangle == -1 && extensions && strstr(extensions, "_texture_rectangle"))
-    use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0;
+    if (extensions) {
+//      if (strstr(extensions, "_texture_non_power_of_two"))
+      if (strstr(extensions, "_texture_rectangle"))
+        use_rectangle = renderer && strstr(renderer, "Mesa DRI R200") ? 1 : 0;
+    }
+  }
   if (use_osd == -1)
     use_osd = mpglBindTexture != NULL;
   if (use_yuv == -1)
diff --git a/libvo/vo_md5sum.c b/libvo/vo_md5sum.c
index 572f643a46..43703997b8 100644
--- a/libvo/vo_md5sum.c
+++ b/libvo/vo_md5sum.c
@@ -218,6 +218,8 @@ static uint32_t draw_image(mp_image_t *mpi)
             h = h / 2;
             for (i=0; i<h; i++) {
                 av_md5_update(md5_context, planeU + i * strideU, w);
+            }
+            for (i=0; i<h; i++) {
                 av_md5_update(md5_context, planeV + i * strideV, w);
             }
             av_md5_final(md5_context, md5sum);