vlc | branch: master | Denis Charmet <[email protected]> | Wed May 2 16:07:44 2018 +0200| [44a02e4f76dea15d083db73f38e0a93be4d4cae1] | committer: Rémi Denis-Courmont
clock: rename clock files to input_clock > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=44a02e4f76dea15d083db73f38e0a93be4d4cae1 --- src/Makefile.am | 4 ++-- src/clock/{clock.c => input_clock.c} | 4 ++-- src/clock/{clock.h => input_clock.h} | 2 +- src/input/decoder.c | 2 +- src/input/es_out.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index b80ed96417..2e224bae84 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -231,7 +231,7 @@ libvlccore_la_SOURCES = \ input/item.c \ input/access.c \ clock/clock_internal.c \ - clock/clock.c \ + clock/input_clock.c \ input/control.c \ input/decoder.c \ input/demux.c \ @@ -242,7 +242,7 @@ libvlccore_la_SOURCES = \ input/input.c \ input/info.h \ input/meta.c \ - clock/clock.h \ + clock/input_clock.h \ clock/clock_internal.h \ input/decoder.h \ input/demux.h \ diff --git a/src/clock/clock.c b/src/clock/input_clock.c similarity index 99% rename from src/clock/clock.c rename to src/clock/input_clock.c index f56c9db842..2b34efcea7 100644 --- a/src/clock/clock.c +++ b/src/clock/input_clock.c @@ -1,5 +1,5 @@ /***************************************************************************** - * clock.c: Clock/System date convertions, stream management + * input_clock.c: Input clock/System date convertions, stream management ***************************************************************************** * Copyright (C) 1999-2018 VLC authors and VideoLAN * Copyright (C) 2008 Laurent Aimar @@ -31,7 +31,7 @@ #include <vlc_common.h> #include <vlc_input.h> -#include "clock.h" +#include "input_clock.h" #include "clock_internal.h" #include <assert.h> diff --git a/src/clock/clock.h b/src/clock/input_clock.h similarity index 99% rename from src/clock/clock.h rename to src/clock/input_clock.h index 54ec392d81..e7210af75e 100644 --- a/src/clock/clock.h +++ b/src/clock/input_clock.h @@ -1,5 +1,5 @@ /***************************************************************************** - * clock.h: clocks synchronisation + * input_clock.h: Input clocks synchronisation ***************************************************************************** * Copyright (C) 2008-2018 VLC authors and VideoLAN * Copyright (C) 2008 Laurent Aimar diff --git a/src/input/decoder.c b/src/input/decoder.c index 4fc483dcc1..3024648f37 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -46,7 +46,7 @@ #include "audio_output/aout_internal.h" #include "stream_output/stream_output.h" #include "input_internal.h" -#include "../clock/clock.h" +#include "../clock/input_clock.h" #include "decoder.h" #include "event.h" #include "resource.h" diff --git a/src/input/es_out.c b/src/input/es_out.c index 3b909ebf62..62ea92cbc7 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -41,7 +41,7 @@ #include <vlc_meta.h> #include "input_internal.h" -#include "../clock/clock.h" +#include "../clock/input_clock.h" #include "decoder.h" #include "es_out.h" #include "event.h" _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
