vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Jan 18 23:03:39 2019 +0200| [c1dc8c3c0614f0c5e09b28105705b867e3d9946a] | committer: Rémi Denis-Courmont
vout: vout_Request() requires a format ...since vout_Stop() is used when there is no format now. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1dc8c3c0614f0c5e09b28105705b867e3d9946a --- src/video_output/video_output.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index d83c828216..daac63ee33 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -229,15 +229,16 @@ vout_thread_t *vout_Request(vlc_object_t *object, { vout_thread_t *vout = cfg->vout; + assert(cfg->fmt != NULL); + /* If a vout is provided, try reusing it */ if (vout) { - if (vout->p->input != input) { - if (vout->p->input) - spu_Detach(vout->p->spu); + if (vout->p->input == NULL) { vout->p->input = input; - if (vout->p->input) - spu_Attach(vout->p->spu, vout->p->input); - } + if (input != NULL) + spu_Attach(vout->p->spu, input); + } else + assert(vout->p->input == input); vout_control_cmd_t cmd; vout_control_cmd_Init(&cmd, VOUT_CONTROL_REINIT); @@ -245,8 +246,7 @@ vout_thread_t *vout_Request(vlc_object_t *object, vout_control_Push(&vout->p->control, &cmd); vout_control_WaitEmpty(&vout->p->control); - if (cfg->fmt) - vout_IntfReinit(vout); + vout_IntfReinit(vout); if (!vout->p->dead) { msg_Dbg(object, "reusing provided vout"); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
