vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Jan 26 11:31:29 2019 +0200| [f58db3a1de580d3f040fbc3265eeaec9f161e637] | committer: Rémi Denis-Courmont
vout: constify display configuration at start The configuration could be modified only on failure. This is no longer necessary for the same reason as the previous changeset. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f58db3a1de580d3f040fbc3265eeaec9f161e637 --- src/video_output/video_output.c | 2 +- src/video_output/vout_internal.h | 3 ++- src/video_output/vout_wrapper.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index b02fbbe89d..63b4d35e05 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1549,7 +1549,7 @@ static void ThreadProcessMouseState(vout_thread_t *vout, vout->p->mouse_event(m, vout->p->opaque); } -static int ThreadStart(vout_thread_t *vout, vout_display_cfg_t *cfg) +static int ThreadStart(vout_thread_t *vout, const vout_display_cfg_t *cfg) { vlc_mouse_Init(&vout->p->mouse); vout->p->decoder_fifo = picture_fifo_New(); diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 0f869b524d..512318fcdb 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -204,7 +204,8 @@ void vout_IntfInit( vout_thread_t * ); void vout_IntfReinit( vout_thread_t * ); /* */ -int vout_OpenWrapper(vout_thread_t *, const char *, vout_display_cfg_t *); +int vout_OpenWrapper(vout_thread_t *, const char *, + const vout_display_cfg_t *); void vout_CloseWrapper(vout_thread_t *, vout_display_cfg_t *); /* */ diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c index c39fdf1c3e..b1e291bde3 100644 --- a/src/video_output/vout_wrapper.c +++ b/src/video_output/vout_wrapper.c @@ -65,7 +65,7 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args) * *****************************************************************************/ int vout_OpenWrapper(vout_thread_t *vout, - const char *splitter_name, vout_display_cfg_t *cfg) + const char *splitter_name, const vout_display_cfg_t *cfg) { vout_thread_sys_t *sys = vout->p; vout_display_t *vd; @@ -153,7 +153,7 @@ int vout_OpenWrapper(vout_thread_t *vout, return VLC_SUCCESS; error: - vout_DeleteDisplay(vd, cfg); + vout_display_Delete(vd); return VLC_EGENERIC; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
