vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 15 12:54:21 2014 +0200| [22e8f158aa210577ba3cef58c8bb7d3c8855c1cb] | committer: Rémi Denis-Courmont
sout_MuxGetStream: fix prototype, sign warning > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=22e8f158aa210577ba3cef58c8bb7d3c8855c1cb --- include/vlc_sout.h | 2 +- src/stream_output/stream_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vlc_sout.h b/include/vlc_sout.h index cc889eb..ba6d0a4 100644 --- a/include/vlc_sout.h +++ b/include/vlc_sout.h @@ -158,7 +158,7 @@ VLC_API sout_input_t * sout_MuxAddStream( sout_mux_t *, es_format_t * ) VLC_USED VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * ); VLC_API void sout_MuxDelete( sout_mux_t * ); VLC_API int sout_MuxSendBuffer( sout_mux_t *, sout_input_t *, block_t * ); -VLC_API int sout_MuxGetStream(sout_mux_t *, int , mtime_t *); +VLC_API int sout_MuxGetStream(sout_mux_t *, unsigned, mtime_t *); static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... ) { diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 06cac75..4b4c89e 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -548,7 +548,7 @@ int sout_MuxSendBuffer( sout_mux_t *p_mux, sout_input_t *p_input, /***************************************************************************** * sout_MuxGetStream: find stream to be muxed *****************************************************************************/ -int sout_MuxGetStream( sout_mux_t *p_mux, int i_blocks, mtime_t *pi_dts ) +int sout_MuxGetStream( sout_mux_t *p_mux, unsigned i_blocks, mtime_t *pi_dts ) { mtime_t i_dts = 0; int i_stream = -1; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
