[vlc-commits] stream: do not move file offset on seek error

Rémi Denis-Courmont git at videolan.org
Sat Jul 25 12:56:26 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jul 25 13:55:48 2015 +0300| [b34445c43545a5bcd2d3afbfd70da514d370eda4] | committer: Rémi Denis-Courmont

stream: do not move file offset on seek error

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b34445c43545a5bcd2d3afbfd70da514d370eda4
---

 src/input/stream.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/input/stream.c b/src/input/stream.c
index c12ed1a..e98393c 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -464,13 +464,13 @@ int stream_vaControl(stream_t *s, int cmd, va_list args)
         {
             uint64_t pos = va_arg(args, uint64_t);
 
-            if (priv->peek != NULL)
+            int ret = stream_ControlInternal(s, STREAM_SET_POSITION, pos);
+            if (ret == VLC_SUCCESS && priv->peek != NULL)
             {
                 block_Release(priv->peek);
                 priv->peek = NULL;
             }
-
-            return stream_ControlInternal(s, STREAM_SET_POSITION, pos);
+            return ret;
         }
     }
     return s->pf_control(s, cmd, args);



More information about the vlc-commits mailing list