X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fmem_stream.c;h=9978a13c7e5c03c283d0a22214b24b4e40972152;hb=a78e273ec53ff8a6c3993f3deda0b893f8dd709a;hp=5c49dfcde912acbd88fc208a7eadd9bbd26ac9e1;hpb=1a539b89a99f0692a95d914459e3506b50035ce6;p=vlc diff --git a/src/input/mem_stream.c b/src/input/mem_stream.c index 5c49dfcde9..9978a13c7e 100644 --- a/src/input/mem_stream.c +++ b/src/input/mem_stream.c @@ -21,7 +21,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "input_internal.h" @@ -80,7 +83,7 @@ static void Delete( stream_t *s ) if( !s->p_sys->i_preserve_memory ) free( s->p_sys->p_buffer ); free( s->p_sys ); vlc_object_detach( s ); - vlc_object_destroy( s ); + vlc_object_release( s ); } /**************************************************************************** @@ -119,11 +122,12 @@ static int Control( stream_t *s, int i_query, va_list args ) case STREAM_SET_POSITION: i_64 = (int64_t)va_arg( args, int64_t ); i_64 = __MAX( i_64, 0 ); - i_64 = __MIN( i_64, s->p_sys->i_size ); + i_64 = __MIN( i_64, s->p_sys->i_size ); p_sys->i_pos = i_64; break; case STREAM_GET_MTU: + case STREAM_GET_CONTENT_TYPE: return VLC_EGENERIC; case STREAM_CONTROL_ACCESS: