vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Fri Aug 23 14:06:11 2019 +0200| [82621560e0b6225eb381b2dd1c8b44aef2adba33] | committer: Steve Lhomme
sout: transcode: remove unused parameters > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82621560e0b6225eb381b2dd1c8b44aef2adba33 --- modules/stream_out/transcode/transcode.c | 5 ++--- modules/stream_out/transcode/transcode.h | 4 ++-- modules/stream_out/transcode/video.c | 15 ++++----------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c index 29ebde59fe..c0303d1aba 100644 --- a/modules/stream_out/transcode/transcode.c +++ b/modules/stream_out/transcode/transcode.c @@ -528,8 +528,7 @@ static int GetVideoDimensions( void *cbdata, unsigned *w, unsigned *h ) int i_ret = VLC_EGENERIC; vlc_mutex_lock( &p_sys->lock ); if( p_sys->id_video ) - i_ret = transcode_video_get_output_dimensions( p_stream, - p_sys->id_video, w, h ); + i_ret = transcode_video_get_output_dimensions( p_sys->id_video, w, h ); vlc_mutex_unlock( &p_sys->lock ); return i_ret; } @@ -706,7 +705,7 @@ static void Del( sout_stream_t *p_stream, void *_id ) if( id == p_sys->id_video ) p_sys->id_video = NULL; vlc_mutex_unlock( &p_sys->lock ); - transcode_video_clean( p_stream, id ); + transcode_video_clean( id ); break; case SPU_ES: decoder_Destroy( id->p_decoder ); diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h index 862347ef5d..8b48770c26 100644 --- a/modules/stream_out/transcode/transcode.h +++ b/modules/stream_out/transcode/transcode.h @@ -202,10 +202,10 @@ int transcode_audio_init ( sout_stream_t *, const es_format_t *, /* VIDEO */ -void transcode_video_clean ( sout_stream_t *, sout_stream_id_sys_t * ); +void transcode_video_clean ( sout_stream_id_sys_t * ); int transcode_video_process( sout_stream_t *, sout_stream_id_sys_t *, block_t *, block_t ** ); -int transcode_video_get_output_dimensions( sout_stream_t *, sout_stream_id_sys_t *, +int transcode_video_get_output_dimensions( sout_stream_id_sys_t *, unsigned *w, unsigned *h ); void transcode_video_push_spu( sout_stream_t *, sout_stream_id_sys_t *, subpicture_t * ); int transcode_video_init ( sout_stream_t *, const es_format_t *, diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index 3ea02ec132..18b7ffda20 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -438,11 +438,8 @@ static int transcode_video_filters_init( sout_stream_t *p_stream, return VLC_SUCCESS; } -void transcode_video_clean( sout_stream_t *p_stream, - sout_stream_id_sys_t *id ) +void transcode_video_clean( sout_stream_id_sys_t *id ) { - VLC_UNUSED(p_stream); - /* Close encoder */ transcode_encoder_close( id->encoder ); transcode_encoder_delete( id->encoder ); @@ -474,10 +471,9 @@ void transcode_video_push_spu( sout_stream_t *p_stream, sout_stream_id_sys_t *id spu_PutSubpicture( id->p_spu, p_subpicture ); } -int transcode_video_get_output_dimensions( sout_stream_t *p_stream, sout_stream_id_sys_t *id, +int transcode_video_get_output_dimensions( sout_stream_id_sys_t *id, unsigned *w, unsigned *h ) { - VLC_UNUSED(p_stream); vlc_mutex_lock( &id->fifo.lock ); *w = id->decoder_out.video.i_visible_width; *h = id->decoder_out.video.i_visible_height; @@ -485,11 +481,8 @@ int transcode_video_get_output_dimensions( sout_stream_t *p_stream, sout_stream_ return (*w && *h) ? VLC_SUCCESS : VLC_EGENERIC; } -static picture_t * RenderSubpictures( sout_stream_t *p_stream, sout_stream_id_sys_t *id, - picture_t *p_pic ) +static picture_t * RenderSubpictures( sout_stream_id_sys_t *id, picture_t *p_pic ) { - VLC_UNUSED(p_stream); - if( !id->p_spu ) return p_pic; @@ -687,7 +680,7 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id, break; /* Blend subpictures */ - p_in = RenderSubpictures( p_stream, id, p_in ); + p_in = RenderSubpictures( id, p_in ); if( p_in ) { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits