[vlc-devel] commit: stream: Don't attempt to seek() when reading to NULL in *Immediate method, as pointed by Rémi . (Pierre d'Herbemont )
git version control
git at videolan.org
Fri Jun 6 13:09:04 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Fri Jun 6 13:10:36 2008 +0200| [1403a857a80372af56bd37b70f24275b95f88408]
stream: Don't attempt to seek() when reading to NULL in *Immediate method, as pointed by Rémi.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1403a857a80372af56bd37b70f24275b95f88408
---
src/input/stream.c | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/src/input/stream.c b/src/input/stream.c
index 16824cc..2aa946d 100644
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -1524,22 +1524,6 @@ static int AStreamReadImmediate( stream_t *s, void *p_read, int i_read )
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,
* that we could copy directly */
int i_copy = __MIN( stream_buffered_size( s ), i_read );
More information about the vlc-devel
mailing list