vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Jan 18 21:39:34 2019 +0200| [a0d05757ebbfff71c906c27b29e46ffc23bc1c23] | committer: Rémi Denis-Courmont
decoder: remove aout_request_vout_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a0d05757ebbfff71c906c27b29e46ffc23bc1c23 --- include/vlc_aout.h | 1 - src/audio_output/aout_internal.h | 7 ------- src/input/decoder.c | 20 -------------------- 3 files changed, 28 deletions(-) diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 896d9eb53f..433bbee117 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -491,7 +491,6 @@ typedef struct }; typedef struct aout_filters aout_filters_t; -typedef struct aout_request_vout aout_request_vout_t; VLC_API aout_filters_t *aout_FiltersNew(vlc_object_t *, const audio_sample_format_t *, diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h index 9ceb3a0996..204fce5615 100644 --- a/src/audio_output/aout_internal.h +++ b/src/audio_output/aout_internal.h @@ -36,13 +36,6 @@ enum { AOUT_RESAMPLING_DOWN }; -struct aout_request_vout -{ - struct vout_thread_t *(*pf_request_vout)( void *, struct vout_thread_t *, - const video_format_t *); - void *p_private; -}; - typedef struct aout_volume aout_volume_t; typedef struct aout_dev aout_dev_t; diff --git a/src/input/decoder.c b/src/input/decoder.c index ef0d69e52f..ae8f700302 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -301,22 +301,6 @@ static void MouseEvent( const vlc_mouse_t *newmouse, void *user_data ) /***************************************************************************** * Buffers allocation callbacks for the decoders *****************************************************************************/ -static vout_thread_t *aout_request_vout( void *p_private, - vout_thread_t *p_vout, - const video_format_t *p_fmt ) -{ - decoder_t *p_dec = p_private; - struct decoder_owner *p_owner = dec_get_owner( p_dec ); - - assert((p_fmt == NULL) != (p_vout == NULL)); - - p_vout = input_resource_RequestVout( p_owner->p_resource, - &(vout_configuration_t){ .vout = p_vout, .fmt = p_fmt, .dpb_size = 1 }, - false ); - - return p_vout; -} - static bool aout_replaygain_changed( const audio_replay_gain_t *a, const audio_replay_gain_t *b ) { @@ -380,10 +364,6 @@ static int aout_update_format( decoder_t *p_dec ) format.i_chan_mode &= ~AOUT_CHANMODE_DOLBYSTEREO; } - aout_request_vout_t request_vout = { - .pf_request_vout = aout_request_vout, - .p_private = p_dec, - }; audio_output_t *p_aout; p_aout = input_resource_GetAout( p_owner->p_resource ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
