Changeset 1403a857a80372af56bd37b70f24275b95f88408

Timestamp:

06/06/08 13:10:36 (6 months ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212750636 +0200

git-parent:

[e0791ca6584cc946e3cbd94695c88cb6bde4d289]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1212750636 +0200

Message:

stream: Don't attempt to seek() when reading to NULL in *Immediate method, as pointed by Rémi.

Files:

• src/input/stream.c (modified) (1 diff)

src/input/stream.c

@@ -1524 +1524 @@
-             p_read, i_read );
-#endif
-
-    /* No buffer, do as if we were seeking. */
-    if( !p_read )
-    {
-        /* seek within this stream if possible, else use plain old read and discard */
-        access_t     *p_access = p_sys->p_access;
-
-        /* seeking after EOF is not what we want */
-        if( !( p_access->info.b_eof ) )
-        {
-            bool   b_aseek;
-            access_Control( p_access, ACCESS_CAN_SEEK, &b_aseek );
-            if( b_aseek )
-                return AStreamSeekImmediate( s, p_sys->i_pos + i_read ) ? 0 : i_read;
-        }
-    }
-
-    /* First, check if we already have some data in the buffer,