vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jan 23 21:37:41 2019 +0200| [389ed7067193e1d49db9b0a2f959a681f0b66bec] | committer: Rémi Denis-Courmont
vout: always pass a configuration to ThreadStart() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=389ed7067193e1d49db9b0a2f959a681f0b66bec --- src/video_output/video_output.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 407cec76c0..4fcec2960b 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1424,12 +1424,6 @@ static int ThreadStart(vout_thread_t *vout, vout_display_cfg_t *cfg) vout->p->filter.chain_interactive = filter_chain_NewVideo( vout, true, &owner ); - vout_display_cfg_t cfg_default; - if (cfg == NULL) { - VoutGetDisplayCfg(vout, &cfg_default); - cfg = &cfg_default; - } - if (vout_OpenWrapper(vout, vout->p->splitter_name, cfg)) goto error; assert(vout->p->decoder_pool && vout->p->private_pool); @@ -1656,7 +1650,10 @@ static void *Thread(void *object) vlc_tick_t deadline = VLC_TICK_INVALID; bool wait = false; - if (ThreadStart(vout, NULL)) + vout_display_cfg_t cfg_default; + VoutGetDisplayCfg(vout, &cfg_default); + + if (ThreadStart(vout, &cfg_default)) goto out; for (;;) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
