vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Sep 18 18:06:11 2014 +0300| [adced89b123b30b2b11fb88f8b0c42b3e98445dc] | committer: Rémi Denis-Courmont
video_output: avoid variable shadowing > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=adced89b123b30b2b11fb88f8b0c42b3e98445dc --- src/video_output/display.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/video_output/display.c b/src/video_output/display.c index 614f4d4..03b889f 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -1624,23 +1624,20 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, wrapper->sys = sys; /* */ - video_splitter_owner_t *owner = malloc(sizeof(*owner)); - if (!owner) - abort(); - owner->wrapper = wrapper; - splitter->p_owner = owner; + video_splitter_owner_t *vso = xmalloc(sizeof(*vso)); + vso->wrapper = wrapper; + splitter->p_owner = vso; splitter->pf_picture_new = SplitterPictureNew; splitter->pf_picture_del = SplitterPictureDel; /* */ TAB_INIT(sys->count, sys->display); for (int i = 0; i < splitter->i_output; i++) { - vout_display_owner_t owner; - - owner.event = SplitterEvent; - owner.window_new = SplitterNewWindow; - owner.window_del = SplitterDelWindow; - + vout_display_owner_t vdo = { + .event = SplitterEvent, + .window_new = SplitterNewWindow, + .window_del = SplitterDelWindow, + }; const video_splitter_output_t *output = &splitter->p_output[i]; vout_display_state_t ostate; @@ -1654,9 +1651,9 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, ostate.cfg.zoom.den = 1; vout_display_t *vd = DisplayNew(vout, &output->fmt, &ostate, - output->psz_module ? output->psz_module : module, - false, wrapper, - double_click_timeout, hide_timeout, &owner); + output->psz_module ? output->psz_module : module, + false, wrapper, + double_click_timeout, hide_timeout, &vdo); if (!vd) { vout_DeleteDisplay(wrapper, NULL); return NULL; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
