vlc | branch: master | Thomas Guillem <[email protected]> | Tue Jun 23 10:02:52 2015 +0200| [87d07ba3acd385c7a164ac8a534e1218ee3d550b] | committer: Thomas Guillem
stream: fix arguments mismatch > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=87d07ba3acd385c7a164ac8a534e1218ee3d550b --- src/input/stream.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/input/stream.c b/src/input/stream.c index 8dbae4e..3251510 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -195,8 +195,21 @@ static int AReadStream( stream_t *s, void *p_read, unsigned int i_read ); static input_item_t *AStreamReadDir( stream_t *s ); /* Common */ -static int AStreamGenericError( ) { return VLC_EGENERIC; } -static input_item_t * AStreamDirGenericError( ) { return NULL; } +static int AStreamReadError( stream_t *s, void *p_read, unsigned int i_read ) +{ + (void) s; (void) p_read; (void) i_read; + return VLC_EGENERIC; +} +static int AStreamPeekError( stream_t *s, const uint8_t **pp_peek, unsigned int i_read ) +{ + (void) s; (void) pp_peek; (void) i_read; + return VLC_EGENERIC; +} +static input_item_t * AStreamReadDirError( stream_t *s ) +{ + (void) s; + return NULL; +} static int AStreamControl( stream_t *s, int i_query, va_list ); static void AStreamDestroy( stream_t *s ); static int ASeek( stream_t *s, uint64_t i_pos ); @@ -284,9 +297,9 @@ stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list ) return NULL; } - s->pf_read = AStreamGenericError; /* Replaced later */ - s->pf_peek = AStreamGenericError; - s->pf_readdir = AStreamDirGenericError; + s->pf_read = AStreamReadError; /* Replaced later */ + s->pf_peek = AStreamPeekError; /* Replaced later */ + s->pf_readdir = AStreamReadDirError; /* Replaced later */ s->pf_control = AStreamControl; s->pf_destroy = AStreamDestroy; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
