Mercurial > mplayer.hg

changeset 33360:c36ab8db37f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
100l, fix seek cache controls with cache enabled, broken by r33435.
author reimar
date Sun, 08 May 2011 18:44:43 +0000
parents b1e64a3d6dd3
children b433bc008e23
files stream/cache2.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/stream/cache2.c	Sun May 08 18:14:37 2011 +0000
+++ b/stream/cache2.c	Sun May 08 18:44:43 2011 +0000
@@ -276,18 +276,20 @@
   }
   if (s->control == -1) return 1;
   switch (s->control) {
+    case STREAM_CTRL_SEEK_TO_TIME:
+      double_res = s->control_double_arg;
     case STREAM_CTRL_GET_CURRENT_TIME:
-    case STREAM_CTRL_SEEK_TO_TIME:
     case STREAM_CTRL_GET_ASPECT_RATIO:
       s->control_res = s->stream->control(s->stream, s->control, &double_res);
       s->control_double_arg = double_res;
       break;
     case STREAM_CTRL_SEEK_TO_CHAPTER:
+    case STREAM_CTRL_SET_ANGLE:
+      uint_res = s->control_uint_arg;
     case STREAM_CTRL_GET_NUM_CHAPTERS:
     case STREAM_CTRL_GET_CURRENT_CHAPTER:
     case STREAM_CTRL_GET_NUM_ANGLES:
     case STREAM_CTRL_GET_ANGLE:
-    case STREAM_CTRL_SET_ANGLE:
       s->control_res = s->stream->control(s->stream, s->control, &uint_res);
       s->control_uint_arg = uint_res;
       break;