vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 24 22:43:11 2019 +0200| [e65a503f5bbe68e9a89efc73e39860a234afb520] | committer: Rémi Denis-Courmont
interlacing: remove constant parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e65a503f5bbe68e9a89efc73e39860a234afb520 --- src/video_output/interlacing.c | 8 ++------ src/video_output/interlacing.h | 2 +- src/video_output/video_output.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/video_output/interlacing.c b/src/video_output/interlacing.c index ace2ca84e9..3192b3a9cf 100644 --- a/src/video_output/interlacing.c +++ b/src/video_output/interlacing.c @@ -95,7 +95,7 @@ static int DeinterlaceCallback(vlc_object_t *object, char const *cmd, return VLC_SUCCESS; } -void vout_InitInterlacingSupport(vout_thread_t *vout, bool is_interlaced) +void vout_InitInterlacingSupport(vout_thread_t *vout) { vlc_value_t val; @@ -155,15 +155,11 @@ void vout_InitInterlacingSupport(vout_thread_t *vout, bool is_interlaced) /* */ val.psz_string = deinterlace_mode ? deinterlace_mode : optm->orig.psz; var_Change(vout, "deinterlace-mode", VLC_VAR_SETVALUE, val); - val.b_bool = is_interlaced; - var_Change(vout, "deinterlace-needed", VLC_VAR_SETVALUE, val); var_SetInteger(vout, "deinterlace", deinterlace_state); free(deinterlace_mode); - vout->p->interlacing.is_interlaced = is_interlaced; - if (is_interlaced) - vout->p->interlacing.date = vlc_tick_now(); + vout->p->interlacing.is_interlaced = false; } void vout_ReinitInterlacingSupport(vout_thread_t *vout) diff --git a/src/video_output/interlacing.h b/src/video_output/interlacing.h index af117ce259..c8b4b65fe5 100644 --- a/src/video_output/interlacing.h +++ b/src/video_output/interlacing.h @@ -23,7 +23,7 @@ #ifndef LIBVLC_VOUT_INTERLACING_H #define LIBVLC_VOUT_INTERLACING_H -void vout_InitInterlacingSupport(vout_thread_t *, bool is_interlaced); +void vout_InitInterlacingSupport(vout_thread_t *); void vout_ReinitInterlacingSupport(vout_thread_t *); void vout_SetInterlacingState(vout_thread_t *, bool is_interlaced); diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index ba3b460c6b..a01a615201 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -158,7 +158,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object, sys->title.timeout = var_InheritInteger(vout, "video-title-timeout"); sys->title.position = var_InheritInteger(vout, "video-title-position"); - vout_InitInterlacingSupport(vout, sys->displayed.is_interlaced); + vout_InitInterlacingSupport(vout); sys->is_late_dropped = var_InheritBool(vout, "drop-late-frames"); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
