vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Feb 24 14:02:46 2019 +0200| [ad60d5c60323844d1b133d33a308a6443ae47306] | committer: Rémi Denis-Courmont
vout: remove unused parent vout_Request() parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad60d5c60323844d1b133d33a308a6443ae47306 --- src/audio_output/filters.c | 2 +- src/input/resource.c | 2 +- src/video_output/video_output.c | 4 +--- src/video_output/vout_internal.h | 6 ++---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c index 7a82c88c4a..d86a32a81d 100644 --- a/src/audio_output/filters.c +++ b/src/audio_output/filters.c @@ -393,7 +393,7 @@ vout_thread_t *aout_filter_GetVout(filter_t *filter, const video_format_t *fmt) video_format_AdjustColorSpace(&adj_fmt); - return vout_Request(VLC_OBJECT(filter), &cfg, NULL); + return vout_Request(&cfg, NULL); } static int AppendFilter(vlc_object_t *obj, const char *type, const char *name, diff --git a/src/input/resource.c b/src/input/resource.c index 0343576e61..9db0ce70d3 100644 --- a/src/input/resource.c +++ b/src/input/resource.c @@ -399,7 +399,7 @@ vout_thread_t *input_resource_GetVout(input_resource_t *p_resource, vlc_mutex_unlock(&p_resource->lock_hold); } - vout = vout_Request(p_resource->p_parent, cfg, p_resource->p_input); + vout = vout_Request(cfg, p_resource->p_input); if (vout != NULL) { DisplayVoutTitle(p_resource, vout); diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 50382c96a2..8f9c571c25 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1732,9 +1732,7 @@ vout_thread_t *vout_Create(vlc_object_t *object) return vout; } -#undef vout_Request -vout_thread_t *vout_Request(vlc_object_t *object, - const vout_configuration_t *cfg, +vout_thread_t *vout_Request(const vout_configuration_t *cfg, input_thread_t *input) { vout_thread_t *vout = cfg->vout; diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 37d20844dd..8b1f7231a9 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -191,14 +191,12 @@ vout_thread_t *vout_Create(vlc_object_t *obj) VLC_USED; * * You can release the returned value either by vout_Request() or vout_Close(). * - * \param object a vlc object * \param cfg the video configuration requested. * \param input used to get attachments for spu filters * \return a vout */ -vout_thread_t * vout_Request( vlc_object_t *object, const vout_configuration_t *cfg, - input_thread_t *input ); -#define vout_Request(a,b,c) vout_Request(VLC_OBJECT(a),b,c) +vout_thread_t * vout_Request(const vout_configuration_t *cfg, + input_thread_t *input); /** * Disables a vout. _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
