# HG changeset patch
# User reimar
# Date 1195325212 0
# Node ID f795ef502972afe1018e8947b10c70757a39eb74
# Parent  38a6ae2c303d1b2955679ea651bfc9fc1afc20cf
Move everything that sets buffer values together.

diff -r 38a6ae2c303d -r f795ef502972 stream/stream_dvd.c
--- a/stream/stream_dvd.c	Sat Nov 17 18:40:46 2007 +0000
+++ b/stream/stream_dvd.c	Sat Nov 17 18:46:52 2007 +0000
@@ -70,8 +70,6 @@
     return;
   case -1: /* restore default value */
     if (dvd_speed == 0) return; /* we haven't touched the speed setting */
-    speed = 0;
-    buffer[0] = 4; /* restore default */
     mp_msg(MSGT_OPEN, MSGL_INFO, MSGTR_DVDrestoreSpeed);
     break;
   default: /* limit to <speed> KB/s */
@@ -98,9 +96,13 @@
   /* first sector 0, last sector 0xffffffff */
   AV_WB32(buffer + 8, 0xffffffff);
 
+  if (speed == -1)
+    buffer[0] = 4; /* restore default */
+  else {
   /* <speed> kilobyte */
   AV_WB32(buffer + 12, speed);
   AV_WB32(buffer + 20, speed);
+  }
 
   /* 1 second */
   AV_WB16(buffer + 18, 1000);