diff options
-rw-r--r-- | compat/va_copy.h | 5 | ||||
-rw-r--r-- | libavcodec/dcamath.h | 5 | ||||
-rw-r--r-- | libavcodec/dvaudio.h | 5 | ||||
-rw-r--r-- | libavcodec/frame_thread_encoder.h | 4 | ||||
-rw-r--r-- | libavcodec/xface.h | 5 | ||||
-rw-r--r-- | libavdevice/decklink_common.h | 4 | ||||
-rw-r--r-- | libavdevice/decklink_common_c.h | 4 | ||||
-rw-r--r-- | libavdevice/decklink_dec.h | 5 | ||||
-rw-r--r-- | libavdevice/decklink_enc.h | 5 | ||||
-rw-r--r-- | libavfilter/blend.h | 5 | ||||
-rw-r--r-- | libavfilter/hermite.h | 5 | ||||
-rw-r--r-- | libavfilter/maskedmerge.h | 5 | ||||
-rw-r--r-- | libavfilter/removegrain.h | 5 | ||||
-rw-r--r-- | libavutil/aarch64/neontest.h | 5 | ||||
-rw-r--r-- | libavutil/arm/neontest.h | 5 | ||||
-rw-r--r-- | libavutil/opencl_internal.h | 5 | ||||
-rw-r--r-- | libavutil/qsort.h | 5 | ||||
-rw-r--r-- | libavutil/x86/w64xmmtest.h | 5 |
18 files changed, 87 insertions, 0 deletions
diff --git a/compat/va_copy.h b/compat/va_copy.h index 3cb5ebe..a40bbe6 100644 --- a/compat/va_copy.h +++ b/compat/va_copy.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef COMPAT_VA_COPY_H +#define COMPAT_VA_COPY_H + #include <stdarg.h> #if !defined(va_copy) && defined(_MSC_VER) @@ -27,3 +30,5 @@ #if !defined(va_copy) && defined(__GNUC__) && __GNUC__ < 3 #define va_copy(dst, src) __va_copy(dst, src) #endif + +#endif /* COMPAT_VA_COPY_H */ diff --git a/libavcodec/dcamath.h b/libavcodec/dcamath.h index 06dc432..a8a4142 100644 --- a/libavcodec/dcamath.h +++ b/libavcodec/dcamath.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVCODEC_DCAMATH_H +#define AVCODEC_DCAMATH_H + #include "libavutil/common.h" @@ -40,3 +43,5 @@ static inline int64_t dca_round(int64_t a, int bits) else return a; } + +#endif /* AVCODEC_DCAMATH_H */ diff --git a/libavcodec/dvaudio.h b/libavcodec/dvaudio.h index e4d0df1..577183c 100644 --- a/libavcodec/dvaudio.h +++ b/libavcodec/dvaudio.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVCODEC_DVAUDIO_H +#define AVCODEC_DVAUDIO_H + static inline int dv_get_audio_sample_count(const uint8_t *buffer, int dsf) { int samples = buffer[0] & 0x3f; /* samples in this frame - min samples */ @@ -30,3 +33,5 @@ static inline int dv_get_audio_sample_count(const uint8_t *buffer, int dsf) return samples + (dsf ? 1264 : 1053); } } + +#endif /* AVCODEC_DVAUDIO_H */ diff --git a/libavcodec/frame_thread_encoder.h b/libavcodec/frame_thread_encoder.h index 1da0ce1..1f79553 100644 --- a/libavcodec/frame_thread_encoder.h +++ b/libavcodec/frame_thread_encoder.h @@ -18,9 +18,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVCODEC_FRAME_THREAD_ENCODER_H +#define AVCODEC_FRAME_THREAD_ENCODER_H + #include "avcodec.h" int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options); void ff_frame_thread_encoder_free(AVCodecContext *avctx); int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet_ptr); +#endif /* AVCODEC_FRAME_THREAD_ENCODER_H */ diff --git a/libavcodec/xface.h b/libavcodec/xface.h index 0236d71..d366fdb 100644 --- a/libavcodec/xface.h +++ b/libavcodec/xface.h @@ -24,6 +24,9 @@ * X-Face common definitions. */ +#ifndef AVCODEC_XFACE_H +#define AVCODEC_XFACE_H + #include <stdint.h> /* define the face size - 48x48x1 */ @@ -94,3 +97,5 @@ extern const ProbRange ff_xface_probranges_per_level[4][3]; extern const ProbRange ff_xface_probranges_2x2[16]; void ff_xface_generate_face(uint8_t *dst, uint8_t * const src); + +#endif /* AVCODEC_XFACE_H */ diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h index 076c625..1e266d5 100644 --- a/libavdevice/decklink_common.h +++ b/libavdevice/decklink_common.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVDEVICE_DECKLINK_COMMON_H +#define AVDEVICE_DECKLINK_COMMON_H + #include <DeckLinkAPIVersion.h> #include "decklink_common_c.h" @@ -103,3 +106,4 @@ int ff_decklink_set_format(AVFormatContext *avctx, decklink_direction_t directio int ff_decklink_list_devices(AVFormatContext *avctx); int ff_decklink_list_formats(AVFormatContext *avctx, decklink_direction_t direction = DIRECTION_OUT); +#endif /* AVDEVICE_DECKLINK_COMMON_H * diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h index 2b1a579..ce1dff7 100644 --- a/libavdevice/decklink_common_c.h +++ b/libavdevice/decklink_common_c.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVDEVICE_DECKLINK_COMMON_C_H +#define AVDEVICE_DECKLINK_COMMON_C_H + struct decklink_cctx { const AVClass *cclass; @@ -32,3 +35,4 @@ struct decklink_cctx { int v210; }; +#endif /* AVDEVICE_DECKLINK_COMMON_C_H */ diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h index 6bd9226..c02344e 100644 --- a/libavdevice/decklink_dec.h +++ b/libavdevice/decklink_dec.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVDEVICE_DECKLINK_DEC_H +#define AVDEVICE_DECKLINK_DEC_H + #ifdef __cplusplus extern "C" { #endif @@ -30,3 +33,5 @@ int ff_decklink_read_close(AVFormatContext *avctx); #ifdef __cplusplus } /* extern "C" */ #endif + +#endif /* AVDEVICE_DECKLINK_DEC_H */ diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h index 6086947..5ffc05c 100644 --- a/libavdevice/decklink_enc.h +++ b/libavdevice/decklink_enc.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVDEVICE_DECKLINK_ENC_H +#define AVDEVICE_DECKLINK_ENC_H + #ifdef __cplusplus extern "C" { #endif @@ -30,3 +33,5 @@ int ff_decklink_write_trailer(AVFormatContext *avctx); #ifdef __cplusplus } /* extern "C" */ #endif + +#endif /* AVDEVICE_DECKLINK_ENC_H */ diff --git a/libavfilter/blend.h b/libavfilter/blend.h index fcedd41..ed0738c 100644 --- a/libavfilter/blend.h +++ b/libavfilter/blend.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVFILTER_BLEND_H +#define AVFILTER_BLEND_H + #include "libavutil/eval.h" #include "avfilter.h" @@ -68,3 +71,5 @@ typedef struct FilterParams { } FilterParams; void ff_blend_init_x86(FilterParams *param, int is_16bit); + +#endif /* AVFILTER_BLEND_H */ diff --git a/libavfilter/hermite.h b/libavfilter/hermite.h index 5a4645f..fc1c0c6 100644 --- a/libavfilter/hermite.h +++ b/libavfilter/hermite.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVFILTER_HERMITE_H +#define AVFILTER_HERMITE_H + static inline double hermite_interpolation(double x, double x0, double x1, double p0, double p1, double m0, double m1) @@ -38,3 +41,5 @@ static inline double hermite_interpolation(double x, double x0, double x1, return ct3 * t3 + ct2 * t2 + ct1 * t + ct0; } + +#endif /* AVFILTER_HERMITE_H */ diff --git a/libavfilter/maskedmerge.h b/libavfilter/maskedmerge.h index b47a816..a8c7551 100644 --- a/libavfilter/maskedmerge.h +++ b/libavfilter/maskedmerge.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVFILTER_MASKEDMERGE_H +#define AVFILTER_MASKEDMERGE_H + #include "avfilter.h" #include "framesync.h" @@ -38,3 +41,5 @@ typedef struct MaskedMergeContext { } MaskedMergeContext; void ff_maskedmerge_init_x86(MaskedMergeContext *s); + +#endif /* AVFILTER_MASKEDMERGE_H */ diff --git a/libavfilter/removegrain.h b/libavfilter/removegrain.h index 60401fb..f3f1028 100644 --- a/libavfilter/removegrain.h +++ b/libavfilter/removegrain.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVFILTER_REMOVEGRAIN_H +#define AVFILTER_REMOVEGRAIN_H + #include "avfilter.h" typedef struct RemoveGrainContext { @@ -38,3 +41,5 @@ typedef struct RemoveGrainContext { } RemoveGrainContext; void ff_removegrain_init_x86(RemoveGrainContext *rg); + +#endif /* AVFILTER_REMOVEGRAIN_H */ diff --git a/libavutil/aarch64/neontest.h b/libavutil/aarch64/neontest.h index b9d4986..2d0fc19 100644 --- a/libavutil/aarch64/neontest.h +++ b/libavutil/aarch64/neontest.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVUTIL_AARCH64_NEONTEST_H +#define AVUTIL_AARCH64_NEONTEST_H + #include <inttypes.h> #include <stdint.h> #include <stdlib.h> @@ -63,3 +66,5 @@ int __real_ ## func; \ int __wrap_ ## func; \ int __wrap_ ## func + +#endif /* AVUTIL_AARCH64_NEONTEST_H */ diff --git a/libavutil/arm/neontest.h b/libavutil/arm/neontest.h index f668c00..d75ab83 100644 --- a/libavutil/arm/neontest.h +++ b/libavutil/arm/neontest.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVUTIL_ARM_NEONTEST_H +#define AVUTIL_ARM_NEONTEST_H + #include <inttypes.h> #include <stdint.h> #include <stdlib.h> @@ -60,3 +63,5 @@ int __real_ ## func; \ int __wrap_ ## func; \ int __wrap_ ## func + +#endif /* AVUTIL_ARM_NEONTEST_H */ diff --git a/libavutil/opencl_internal.h b/libavutil/opencl_internal.h index ddc6d3a..5cabb7b 100644 --- a/libavutil/opencl_internal.h +++ b/libavutil/opencl_internal.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVUTIL_OPENCL_INTERNAL_H +#define AVUTIL_OPENCL_INTERNAL_H + #include "attributes.h" #include "opencl.h" @@ -33,3 +36,5 @@ typedef struct { av_warn_unused_result int avpriv_opencl_set_parameter(FFOpenclParam *opencl_param, ...); + +#endif /* AVUTIL_OPENCL_INTERNAL_H */ diff --git a/libavutil/qsort.h b/libavutil/qsort.h index eda24b0..39b7a08 100644 --- a/libavutil/qsort.h +++ b/libavutil/qsort.h @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVUTIL_QSORT_H +#define AVUTIL_QSORT_H + #include "common.h" @@ -115,3 +118,5 @@ FFSWAP(type*, p, tmp);\ }\ } while (0) + +#endif /* AVUTIL_QSORT_H */ diff --git a/libavutil/x86/w64xmmtest.h b/libavutil/x86/w64xmmtest.h index 9df499f..a4a05b0 100644 --- a/libavutil/x86/w64xmmtest.h +++ b/libavutil/x86/w64xmmtest.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVUTIL_X86_W64XMMTEST_H +#define AVUTIL_X86_W64XMMTEST_H + #include <inttypes.h> #include <stdint.h> #include <stdlib.h> @@ -71,3 +74,5 @@ int __real_ ## func; \ int __wrap_ ## func; \ int __wrap_ ## func + +#endif /* AVUTIL_X86_W64XMMTEST_H */ |