vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Jun 21 10:12:32 2018 +0200| [68a049fee8c90bef8630bbf1d9da458547029bbb] | committer: Francois Cartegnie
sout: transcode: reorder includes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=68a049fee8c90bef8630bbf1d9da458547029bbb --- modules/stream_out/transcode/audio.c | 9 +++++++-- modules/stream_out/transcode/spu.c | 10 ++++++++-- modules/stream_out/transcode/transcode.c | 2 +- modules/stream_out/transcode/transcode.h | 11 +---------- modules/stream_out/transcode/video.c | 12 +++++++++--- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/modules/stream_out/transcode/audio.c b/modules/stream_out/transcode/audio.c index 60523d47e2..69c87d9e9f 100644 --- a/modules/stream_out/transcode/audio.c +++ b/modules/stream_out/transcode/audio.c @@ -27,13 +27,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include "transcode.h" - +#include <vlc_common.h> #include <vlc_aout.h> #include <vlc_input.h> #include <vlc_meta.h> #include <vlc_modules.h> +#include <vlc_sout.h> + +#include "transcode.h" static const int pi_channels_maps[9] = { diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c index 66d3cb5fa4..4e1337fa27 100644 --- a/modules/stream_out/transcode/spu.c +++ b/modules/stream_out/transcode/spu.c @@ -27,12 +27,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include "transcode.h" - +#include <vlc_common.h> #include <vlc_meta.h> #include <vlc_spu.h> #include <vlc_modules.h> +#include <vlc_sout.h> + +#include "transcode.h" + #include <assert.h> static subpicture_t *spu_new_buffer( decoder_t *p_dec, diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c index a2d8261171..ea4d3baec9 100644 --- a/modules/stream_out/transcode/transcode.c +++ b/modules/stream_out/transcode/transcode.c @@ -34,7 +34,7 @@ #include <vlc_common.h> #include <vlc_plugin.h> - +#include <vlc_sout.h> #include <vlc_spu.h> #include "transcode.h" diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h index be371297bb..cb026cfb32 100644 --- a/modules/stream_out/transcode/transcode.h +++ b/modules/stream_out/transcode/transcode.h @@ -1,16 +1,7 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <vlc_common.h> - -#include <vlc_sout.h> +#include <vlc_picture_fifo.h> #include <vlc_filter.h> -#include <vlc_es.h> #include <vlc_codec.h> -#include <vlc_picture_fifo.h> - /*100ms is around the limit where people are noticing lipsync issues*/ #define MASTER_SYNC_MAX_DRIFT 100000 diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c index e599f48a09..f3e7067716 100644 --- a/modules/stream_out/transcode/video.c +++ b/modules/stream_out/transcode/video.c @@ -27,13 +27,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif -#include "transcode.h" - -#include <math.h> +#include <vlc_common.h> #include <vlc_meta.h> #include <vlc_spu.h> #include <vlc_modules.h> +#include <vlc_sout.h> + +#include "transcode.h" + +#include <math.h> #define ENC_FRAMERATE (25 * 1000) #define ENC_FRAMERATE_BASE 1000 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
