[vlc-devel] [PATCH] various: fix missing include guards
janisozaur at gmail.com
janisozaur at gmail.com
Sun Oct 28 22:57:23 CET 2018
From: Michał Janiszewski <janisozaur+signed at gmail.com>
Signed-off-by: Michał Janiszewski <janisozaur at gmail.com>
---
modules/access/rtp/rtp.h | 5 +++++
modules/access/v4l2/v4l2.h | 5 +++++
modules/codec/spudec/spudec.h | 5 +++++
modules/codec/ttml/ttml.h | 5 +++++
modules/demux/avi/bitmapinfoheader.h | 6 ++++++
modules/demux/mkv/util.hpp | 5 +++++
modules/demux/mpeg/ps.h | 5 +++++
modules/demux/ogg.h | 5 +++++
modules/demux/ogg_granule.h | 5 +++++
modules/demux/oggseek.h | 5 +++++
modules/demux/playlist/playlist.h | 5 +++++
modules/demux/rawdv.h | 5 +++++
modules/mux/mp4/libmp4mux.h | 6 ++++++
modules/mux/mpeg/pes.h | 5 +++++
modules/packetizer/dts_header.h | 5 +++++
modules/packetizer/flac.h | 6 ++++++
modules/packetizer/hxxx_ep3b.h | 6 ++++++
modules/stream_out/transcode/encoder/encoder.h | 5 +++++
modules/stream_out/transcode/encoder/encoder_priv.h | 6 ++++++
modules/stream_out/transcode/transcode.h | 5 +++++
modules/video_chroma/i420_rgb.h | 6 ++++++
src/clock/clock_internal.h | 5 +++++
src/video_output/display.h | 5 +++++
23 files changed, 121 insertions(+)
diff --git a/modules/access/rtp/rtp.h b/modules/access/rtp/rtp.h
index fca75f58df..8bf8bfa9c0 100644
--- a/modules/access/rtp/rtp.h
+++ b/modules/access/rtp/rtp.h
@@ -20,6 +20,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
****************************************************************************/
+#ifndef RTP_H_
+#define RTP_H_
+
typedef struct rtp_pt_t rtp_pt_t;
typedef struct rtp_session_t rtp_session_t;
@@ -81,3 +84,5 @@ typedef struct
bool autodetect; /**< Payload type autodetection pending */
} demux_sys_t;
+
+#endif /* RTP_H_ */
diff --git a/modules/access/v4l2/v4l2.h b/modules/access/v4l2/v4l2.h
index c8ebd7b15e..8a47e95b30 100644
--- a/modules/access/v4l2/v4l2.h
+++ b/modules/access/v4l2/v4l2.h
@@ -18,6 +18,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef V4L2_H_
+#define V4L2_H_
+
#include <linux/videodev2.h>
/* libv4l2 functions */
@@ -86,3 +89,5 @@ void RadioClose(vlc_object_t *);
/* controls.c */
vlc_v4l2_ctrl_t *ControlsInit(vlc_object_t *, int fd);
void ControlsDeinit(vlc_object_t *, vlc_v4l2_ctrl_t *);
+
+#endif /* V4L2_H_ */
diff --git a/modules/codec/spudec/spudec.h b/modules/codec/spudec/spudec.h
index c56f09fe7c..3d8ed4b3eb 100644
--- a/modules/codec/spudec/spudec.h
+++ b/modules/codec/spudec/spudec.h
@@ -21,6 +21,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef SPUDEC_H_
+#define SPUDEC_H_
+
/* #define DEBUG_SPUDEC 1 */
typedef struct
@@ -60,3 +63,5 @@ typedef struct
* Prototypes
*****************************************************************************/
subpicture_t * ParsePacket( decoder_t * );
+
+#endif /* SPUDEC_H_ */
diff --git a/modules/codec/ttml/ttml.h b/modules/codec/ttml/ttml.h
index d375597632..f2f31f8fc9 100644
--- a/modules/codec/ttml/ttml.h
+++ b/modules/codec/ttml/ttml.h
@@ -18,6 +18,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef TTML_H_
+#define TTML_H_
+
int tt_OpenDemux( vlc_object_t* p_this );
void tt_CloseDemux( demux_t* p_demux );
@@ -157,3 +160,5 @@ static inline tt_time_t tt_time_Sub( tt_time_t t1, tt_time_t t2 )
t1.base -= t2.base;
return t1;
}
+
+#endif /* TTML_H_ */
diff --git a/modules/demux/avi/bitmapinfoheader.h b/modules/demux/avi/bitmapinfoheader.h
index f797c2e495..ba3437d787 100644
--- a/modules/demux/avi/bitmapinfoheader.h
+++ b/modules/demux/avi/bitmapinfoheader.h
@@ -20,6 +20,10 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
+#ifndef BITMAPINFOHEADER_H_
+#define BITMAPINFOHEADER_H_
+
#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_codecs.h>
@@ -303,3 +307,5 @@ static inline VLC_BITMAPINFOHEADER * CreateBitmapInfoHeader( const es_format_t *
*pi_total = sizeof(VLC_BITMAPINFOHEADER) + i_bih_extra + i_bmiColors;
return p_bih;
}
+
+#endif /* BITMAPINFOHEADER_H_ */
diff --git a/modules/demux/mkv/util.hpp b/modules/demux/mkv/util.hpp
index 2ea3c0b898..d3397df288 100644
--- a/modules/demux/mkv/util.hpp
+++ b/modules/demux/mkv/util.hpp
@@ -23,6 +23,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef UTIL_HPP_
+#define UTIL_HPP_
+
#include "mkv.hpp"
namespace mkv {
@@ -98,3 +101,5 @@ void MkvTree_va( demux_t& demuxer, int i_level, const char* fmt, va_list args);
void MkvTree( demux_t & demuxer, int i_level, const char *psz_format, ... );
} // namespace
+
+#endif /* UTIL_HPP_ */
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 7917cb3a4d..4183bc85c2 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -21,6 +21,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef PS_H_
+#define PS_H_
+
#include <assert.h>
#include <vlc_demux.h>
#include "timestamps.h"
@@ -719,3 +722,5 @@ static inline int ps_psm_fill( ps_psm_t *p_psm, block_t *p_pkt,
return VLC_SUCCESS;
}
+
+#endif /* PS_H_ */
diff --git a/modules/demux/ogg.h b/modules/demux/ogg.h
index e8010cc51d..c222c8d56d 100644
--- a/modules/demux/ogg.h
+++ b/modules/demux/ogg.h
@@ -26,6 +26,9 @@
* Definitions of structures and functions used by this plugin
*****************************************************************************/
+#ifndef OGG_H_
+#define OGG_H_
+
//#define OGG_DEMUX_DEBUG 1
#ifdef OGG_DEMUX_DEBUG
#define DemuxDebug(code) code
@@ -231,3 +234,5 @@ unsigned const char * Read7BitsVariableLE( unsigned const char *,
uint64_t * );
bool Ogg_GetBoundsUsingSkeletonIndex( logical_stream_t *p_stream, vlc_tick_t i_time,
int64_t *pi_lower, int64_t *pi_upper );
+
+#endif /* OGG_H_ */
diff --git a/modules/demux/ogg_granule.h b/modules/demux/ogg_granule.h
index 5d4f0e1dd3..b89df5e4b2 100644
--- a/modules/demux/ogg_granule.h
+++ b/modules/demux/ogg_granule.h
@@ -18,6 +18,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef OGG_GRANULE_H_
+#define OGG_GRANULE_H_
+
int64_t Ogg_GetKeyframeGranule ( const logical_stream_t *, int64_t i_granule );
bool Ogg_IsKeyFrame ( const logical_stream_t *, const ogg_packet * );
vlc_tick_t Ogg_GranuleToTime( const logical_stream_t *, int64_t i_granule,
@@ -25,3 +28,5 @@ vlc_tick_t Ogg_GranuleToTime( const logical_stream_t *, int64_t i_granule,
vlc_tick_t Ogg_SampleToTime( const logical_stream_t *, int64_t i_sample,
bool b_packetstart );
bool Ogg_GranuleIsValid( const logical_stream_t *, int64_t i_granule );
+
+#endif /* OGG_GRANULE_H */
diff --git a/modules/demux/oggseek.h b/modules/demux/oggseek.h
index a9cd1b0eff..36daa66841 100644
--- a/modules/demux/oggseek.h
+++ b/modules/demux/oggseek.h
@@ -26,6 +26,9 @@
* Preamble
*****************************************************************************/
+#ifndef OGGSEEK_H_
+#define OGGSEEK_H_
+
//#define OGG_SEEK_DEBUG 1
#ifdef OGG_SEEK_DEBUG
#define OggDebug(code) code
@@ -67,3 +70,5 @@ void Oggseek_ProbeEnd( demux_t * );
void oggseek_index_entries_free ( demux_index_entry_t * );
int64_t oggseek_read_page ( demux_t * );
+
+#endif /* OGGSEEK_H_ */
diff --git a/modules/demux/playlist/playlist.h b/modules/demux/playlist/playlist.h
index 6f7f99792c..d455eeed52 100644
--- a/modules/demux/playlist/playlist.h
+++ b/modules/demux/playlist/playlist.h
@@ -21,6 +21,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef PLAYLIST_H_
+#define PLAYLIST_H_
+
#include <vlc_input.h>
char *ProcessMRL( const char *, const char * );
@@ -68,3 +71,5 @@ do { \
if( GetSource(obj)->pf_readdir != NULL ) \
return VLC_EGENERIC; \
} while(0)
+
+#endif /* PLAYLIST_H_ */
diff --git a/modules/demux/rawdv.h b/modules/demux/rawdv.h
index 02d11c76b0..0337de6c5d 100644
--- a/modules/demux/rawdv.h
+++ b/modules/demux/rawdv.h
@@ -22,6 +22,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef RAWDV_H_
+#define RAWDV_H_
+
#define DV_PAL_FRAME_SIZE (12 * 150 * 80)
#define DV_NTSC_FRAME_SIZE (10 * 150 * 80)
@@ -206,3 +209,5 @@ static inline block_t *dv_extract_audio( block_t *p_frame_block )
return p_block;
}
+
+#endif /* RAWDV_H_ */
diff --git a/modules/mux/mp4/libmp4mux.h b/modules/mux/mp4/libmp4mux.h
index 1da7e88e1b..972bbeabfd 100644
--- a/modules/mux/mp4/libmp4mux.h
+++ b/modules/mux/mp4/libmp4mux.h
@@ -20,6 +20,10 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
+#ifndef LIBMP4MUX_H_
+#define LIBMP4MUX_H_
+
#include <vlc_common.h>
#include <vlc_es.h>
#include <vlc_boxes.h>
@@ -107,3 +111,5 @@ void box_gather (bo_t *box, bo_t *box2);
bool mp4mux_CanMux(vlc_object_t *, const es_format_t *, vlc_fourcc_t, bool);
bo_t *mp4mux_GetFtyp(vlc_fourcc_t, uint32_t, vlc_fourcc_t[], size_t i_fourcc);
+
+#endif /* LIBMP4MUX_H_ */
diff --git a/modules/mux/mpeg/pes.h b/modules/mux/mpeg/pes.h
index 297bc82352..7ec0de6f7d 100644
--- a/modules/mux/mpeg/pes.h
+++ b/modules/mux/mpeg/pes.h
@@ -22,6 +22,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef PES_H_
+#define PES_H_
+
#define PES_PROGRAM_STREAM_MAP 0xbc
#define PES_PRIVATE_STREAM_1 0xbd
#define PES_PADDING 0xbe
@@ -39,3 +42,5 @@ void EStoPES ( block_t **pp_pes,
const es_format_t *p_fmt, int i_stream_id,
int b_mpeg2, int b_data_alignment, int i_header_size,
int i_max_pes_size, vlc_tick_t ts_offset );
+
+#endif /* PES_H_ */
diff --git a/modules/packetizer/dts_header.h b/modules/packetizer/dts_header.h
index cdf9053ee5..a697488bb3 100644
--- a/modules/packetizer/dts_header.h
+++ b/modules/packetizer/dts_header.h
@@ -22,6 +22,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef DTS_HEADER_H_
+#define DTS_HEADER_H_
+
#define VLC_DTS_HEADER_SIZE 14
#define PROFILE_DTS_INVALID -1
@@ -48,3 +51,5 @@ bool vlc_dts_header_IsSync( const void *p_buffer, size_t i_buffer );
ssize_t vlc_dts_header_Convert14b16b( void *p_dst, size_t i_dst,
const void *p_src, size_t i_src,
bool b_out_le );
+
+#endif /* DTS_HEADER_H_ */
diff --git a/modules/packetizer/flac.h b/modules/packetizer/flac.h
index 870a30cdf6..f6395d2bdc 100644
--- a/modules/packetizer/flac.h
+++ b/modules/packetizer/flac.h
@@ -17,6 +17,10 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
+#ifndef FLAC_H_
+#define FLAC_H_
+
#include <vlc_common.h>
#define FLAC_HEADER_SIZE_MAX 16
@@ -271,3 +275,5 @@ static inline int FLAC_ParseSyncInfo(const uint8_t *p_buf,
return b_guessing ? -1 : 1;
}
+
+#endif /* FLAC_H_ */
diff --git a/modules/packetizer/hxxx_ep3b.h b/modules/packetizer/hxxx_ep3b.h
index 2ee86d66d9..bb46c16e4e 100644
--- a/modules/packetizer/hxxx_ep3b.h
+++ b/modules/packetizer/hxxx_ep3b.h
@@ -18,6 +18,10 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
+#ifndef HXXX_EP3B_H_
+#define HXXX_EP3B_H_
+
#include <vlc_bits.h>
static inline uint8_t *hxxx_ep3b_to_rbsp( uint8_t *p, uint8_t *end, unsigned *pi_prev, size_t i_count )
@@ -135,3 +139,5 @@ static const bs_byte_callbacks_t hxxx_bsfw_ep3b_callbacks =
hxxx_bsfw_byte_pos_ep3b,
hxxx_bsfw_byte_remain_ep3b,
};
+
+#endif /* HXXX_EP3B_H_ */
diff --git a/modules/stream_out/transcode/encoder/encoder.h b/modules/stream_out/transcode/encoder/encoder.h
index b6030aa31a..ec4a6988a8 100644
--- a/modules/stream_out/transcode/encoder/encoder.h
+++ b/modules/stream_out/transcode/encoder/encoder.h
@@ -17,6 +17,9 @@
* along with this program; if not, If not, see https://www.gnu.org/licenses/
*****************************************************************************/
+#ifndef ENCODER_H_
+#define ENCODER_H_
+
#define ENC_FRAMERATE (25 * 1000)
#define ENC_FRAMERATE_BASE 1000
#define FIRSTVALID(a,b,c) ( a ? a : ( b ? b : c ) )
@@ -96,3 +99,5 @@ int transcode_encoder_audio_configure( vlc_object_t *p_obj,
const audio_format_t *p_dec_out,
transcode_encoder_t *p_enc );
+
+#endif /* ENCODER_H_ */
diff --git a/modules/stream_out/transcode/encoder/encoder_priv.h b/modules/stream_out/transcode/encoder/encoder_priv.h
index 2875ae71a4..0d69ac928c 100644
--- a/modules/stream_out/transcode/encoder/encoder_priv.h
+++ b/modules/stream_out/transcode/encoder/encoder_priv.h
@@ -16,6 +16,10 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, If not, see https://www.gnu.org/licenses/
*****************************************************************************/
+
+#ifndef ENCODER_PRIV_H_
+#define ENCODER_PRIV_H_
+
#include <vlc_picture_fifo.h>
struct transcode_encoder_t
@@ -60,3 +64,5 @@ int transcode_encoder_audio_test( vlc_object_t *p_obj,
const es_format_t *p_dec_out,
vlc_fourcc_t i_codec_in,
es_format_t *p_enc_wanted_in );
+
+#endif /* ENCODER_PRIV_H_ */
diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index fae4f8137d..52aa063d44 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -1,3 +1,6 @@
+#ifndef TRANSCODE_H_
+#define TRANSCODE_H_
+
#include <vlc_picture_fifo.h>
#include <vlc_filter.h>
#include <vlc_codec.h>
@@ -195,3 +198,5 @@ int transcode_video_get_output_dimensions( sout_stream_t *, sout_stream_id_sys_t
void transcode_video_push_spu( sout_stream_t *, sout_stream_id_sys_t *, subpicture_t * );
int transcode_video_init ( sout_stream_t *, const es_format_t *,
sout_stream_id_sys_t *);
+
+#endif /* TRANSCODE_H_ */
diff --git a/modules/video_chroma/i420_rgb.h b/modules/video_chroma/i420_rgb.h
index 6d060397b3..b5c19ca7f7 100644
--- a/modules/video_chroma/i420_rgb.h
+++ b/modules/video_chroma/i420_rgb.h
@@ -20,6 +20,10 @@
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
+#ifndef I420_RGB_H_
+#define I420_RGB_H_
+
#include <limits.h>
#if !defined (SSE2) && !defined (MMX)
@@ -371,3 +375,5 @@ void I420_A8B8G8R8 ( filter_t *, picture_t *, picture_t * );
break; \
} \
+
+#endif /* I420_RGB_H_ */
diff --git a/src/clock/clock_internal.h b/src/clock/clock_internal.h
index 21da59c075..40c748a883 100644
--- a/src/clock/clock_internal.h
+++ b/src/clock/clock_internal.h
@@ -21,6 +21,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef CLOCK_INTERNAL_H_
+#define CLOCK_INTERNAL_H_
+
#include <vlc_common.h>
/*****************************************************************************
@@ -60,3 +63,5 @@ static inline clock_point_t clock_point_Create( vlc_tick_t i_stream, vlc_tick_t
return p;
}
+
+#endif /* CLOCK_INTERNAL_H_ */
diff --git a/src/video_output/display.h b/src/video_output/display.h
index f1297b59c5..14f72e8909 100644
--- a/src/video_output/display.h
+++ b/src/video_output/display.h
@@ -21,6 +21,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#ifndef DISPLAY_H_
+#define DISPLAY_H_
+
#include "vout_wrapper.h"
vout_display_t *vout_NewSplitter(vout_thread_t *vout,
@@ -33,3 +36,5 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *);
+
+#endif /* DISPLAY_H_ */
--
2.19.1
More information about the vlc-devel
mailing list