[vlc-commits] transcode: remove unused parameter
Steve Lhomme
git at videolan.org
Mon Nov 4 16:39:43 CET 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Aug 20 08:24:33 2019 +0200| [67e27d442bb720342583f5349dac33b2cd8ab48f] | committer: Steve Lhomme
transcode: remove unused parameter
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67e27d442bb720342583f5349dac33b2cd8ab48f
---
modules/stream_out/transcode/audio.c | 2 +-
modules/stream_out/transcode/encoder/audio.c | 11 ++++-------
modules/stream_out/transcode/encoder/encoder.h | 3 +--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c
index 98891ee5c8..04bbbfb9f1 100644
--- a/modules/stream_out/transcode/audio.c
+++ b/modules/stream_out/transcode/audio.c
@@ -252,7 +252,7 @@ int transcode_audio_process( sout_stream_t *p_stream,
{
if( !transcode_encoder_opened( id->encoder ) )
{
- transcode_encoder_audio_configure( VLC_OBJECT(p_stream), id->p_enccfg,
+ transcode_encoder_audio_configure( id->p_enccfg,
&id->decoder_out.audio, id->encoder, true );
id->fmt_input_audio = id->decoder_out.audio;
}
diff --git a/modules/stream_out/transcode/encoder/audio.c b/modules/stream_out/transcode/encoder/audio.c
index d45f7a066c..bb21e15588 100644
--- a/modules/stream_out/transcode/encoder/audio.c
+++ b/modules/stream_out/transcode/encoder/audio.c
@@ -74,12 +74,10 @@ int transcode_encoder_audio_open( transcode_encoder_t *p_enc,
return ( p_enc->p_encoder->p_module ) ? VLC_SUCCESS: VLC_EGENERIC;
}
-static int encoder_audio_configure( vlc_object_t *p_obj,
- const transcode_encoder_config_t *p_cfg,
+static int encoder_audio_configure( const transcode_encoder_config_t *p_cfg,
const audio_format_t *p_dec_out,
encoder_t *p_enc, bool b_keep_fmtin )
{
- VLC_UNUSED(p_obj);
audio_format_t *p_enc_in = &p_enc->fmt_in.audio;
audio_format_t *p_enc_out = &p_enc->fmt_out.audio;
@@ -133,13 +131,12 @@ static int encoder_audio_configure( vlc_object_t *p_obj,
return VLC_SUCCESS;
}
-int transcode_encoder_audio_configure( vlc_object_t *p_obj,
- const transcode_encoder_config_t *p_cfg,
+int transcode_encoder_audio_configure( const transcode_encoder_config_t *p_cfg,
const audio_format_t *p_dec_out,
transcode_encoder_t *p_enc,
bool b_keep_fmtin )
{
- return encoder_audio_configure( p_obj, p_cfg, p_dec_out, p_enc->p_encoder, b_keep_fmtin );
+ return encoder_audio_configure( p_cfg, p_dec_out, p_enc->p_encoder, b_keep_fmtin );
}
int transcode_encoder_audio_test( vlc_object_t *p_obj,
@@ -160,7 +157,7 @@ int transcode_encoder_audio_test( vlc_object_t *p_obj,
audio_format_t *p_afmt_out = &p_encoder->fmt_out.audio;
- if( encoder_audio_configure( p_obj, p_cfg, &p_dec_out->audio, p_encoder, false ) )
+ if( encoder_audio_configure( p_cfg, &p_dec_out->audio, p_encoder, false ) )
{
es_format_Clean( &p_encoder->fmt_in );
es_format_Clean( &p_encoder->fmt_out );
diff --git a/modules/stream_out/transcode/encoder/encoder.h b/modules/stream_out/transcode/encoder/encoder.h
index 495c3f6426..fbefaaa82f 100644
--- a/modules/stream_out/transcode/encoder/encoder.h
+++ b/modules/stream_out/transcode/encoder/encoder.h
@@ -90,8 +90,7 @@ void transcode_encoder_video_configure( vlc_object_t *p_obj,
const video_format_t *p_src,
transcode_encoder_t *p_enc );
-int transcode_encoder_audio_configure( vlc_object_t *p_obj,
- const transcode_encoder_config_t *p_cfg,
+int transcode_encoder_audio_configure( const transcode_encoder_config_t *p_cfg,
const audio_format_t *p_dec_out,
transcode_encoder_t *p_enc, bool );
More information about the vlc-commits
mailing list