diff options
61 files changed, 183 insertions, 183 deletions
diff --git a/include/common/attributes.h b/include/common/attributes.h index e3f538c..a9fd0fa 100644 --- a/include/common/attributes.h +++ b/include/common/attributes.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_ATTRIBUTES_H__ -#define __DAV1D_COMMON_ATTRIBUTES_H__ +#ifndef DAV1D_COMMON_ATTRIBUTES_H +#define DAV1D_COMMON_ATTRIBUTES_H #include "config.h" @@ -139,4 +139,4 @@ static inline int clzll(const unsigned long long mask) { } #endif /* !_MSC_VER */ -#endif /* __DAV1D_COMMON_ATTRIBUTES_H__ */ +#endif /* DAV1D_COMMON_ATTRIBUTES_H */ diff --git a/include/common/bitdepth.h b/include/common/bitdepth.h index f150715..f13d8ca 100644 --- a/include/common/bitdepth.h +++ b/include/common/bitdepth.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_BITDEPTH_H__ -#define __DAV1D_COMMON_BITDEPTH_H__ +#ifndef DAV1D_COMMON_BITDEPTH_H +#define DAV1D_COMMON_BITDEPTH_H #include <stdint.h> #include <string.h> @@ -77,4 +77,4 @@ static inline void pixel_set(pixel *const dst, const int val, const int num) { name##_8bpc(__VA_ARGS__); \ name##_16bpc(__VA_ARGS__) -#endif /* __DAV1D_COMMON_BITDEPTH_H__ */ +#endif /* DAV1D_COMMON_BITDEPTH_H */ diff --git a/include/common/dump.h b/include/common/dump.h index e76fe1f..4d2b1ba 100644 --- a/include/common/dump.h +++ b/include/common/dump.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_DUMP_H__ -#define __DAV1D_COMMON_DUMP_H__ +#ifndef DAV1D_COMMON_DUMP_H +#define DAV1D_COMMON_DUMP_H #include <stddef.h> #include <stdint.h> @@ -83,4 +83,4 @@ static inline void ac_dump(const int16_t *buf, int w, int h, const char *what) } } -#endif /* __DAV1D_COMMON_DUMP_H__ */ +#endif /* DAV1D_COMMON_DUMP_H */ diff --git a/include/common/intops.h b/include/common/intops.h index 62c46af..119caab 100644 --- a/include/common/intops.h +++ b/include/common/intops.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_INTOPS_H__ -#define __DAV1D_COMMON_INTOPS_H__ +#ifndef DAV1D_COMMON_INTOPS_H +#define DAV1D_COMMON_INTOPS_H #include <stdint.h> @@ -73,4 +73,4 @@ static inline unsigned inv_recenter(const unsigned r, const unsigned v) { return r - ((v + 1) >> 1); } -#endif /* __DAV1D_COMMON_INTOPS_H__ */ +#endif /* DAV1D_COMMON_INTOPS_H */ diff --git a/include/common/mem.h b/include/common/mem.h index d68639f..3fbcdbc 100644 --- a/include/common/mem.h +++ b/include/common/mem.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_MEM_H__ -#define __DAV1D_COMMON_MEM_H__ +#ifndef DAV1D_COMMON_MEM_H +#define DAV1D_COMMON_MEM_H #include <assert.h> #include <stdlib.h> @@ -80,4 +80,4 @@ static inline void freep(void *ptr) { } } -#endif /* __DAV1D_COMMON_MEM_H__ */ +#endif /* DAV1D_COMMON_MEM_H */ diff --git a/include/common/validate.h b/include/common/validate.h index 9114740..3096f3d 100644 --- a/include/common/validate.h +++ b/include/common/validate.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_VALIDATE_H__ -#define __DAV1D_COMMON_VALIDATE_H__ +#ifndef DAV1D_COMMON_VALIDATE_H +#define DAV1D_COMMON_VALIDATE_H #include <stdio.h> #include <stdlib.h> @@ -56,4 +56,4 @@ #define validate_input(x) validate_input_or_ret(x, ) -#endif /* __DAV1D_COMMON_VALIDATE_H__ */ +#endif /* DAV1D_COMMON_VALIDATE_H */ diff --git a/include/dav1d/common.h b/include/dav1d/common.h index 83257fc..5223f1e 100644 --- a/include/dav1d/common.h +++ b/include/dav1d/common.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_COMMON_H__ -#define __DAV1D_COMMON_H__ +#ifndef DAV1D_COMMON_H +#define DAV1D_COMMON_H #include <stddef.h> #include <stdint.h> @@ -67,4 +67,4 @@ typedef struct Dav1dDataProps { struct Dav1dUserData user_data; ///< user-configurable data, default NULL members } Dav1dDataProps; -#endif /* __DAV1D_COMMON_H__ */ +#endif /* DAV1D_COMMON_H */ diff --git a/include/dav1d/data.h b/include/dav1d/data.h index 63f21fd..7fba991 100644 --- a/include/dav1d/data.h +++ b/include/dav1d/data.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_DATA_H__ -#define __DAV1D_DATA_H__ +#ifndef DAV1D_DATA_H +#define DAV1D_DATA_H #include <stddef.h> #include <stdint.h> @@ -106,4 +106,4 @@ DAV1D_API int dav1d_data_wrap_user_data(Dav1dData *data, */ DAV1D_API void dav1d_data_unref(Dav1dData *data); -#endif /* __DAV1D_DATA_H__ */ +#endif /* DAV1D_DATA_H */ diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h index 82f0a2c..af94804 100644 --- a/include/dav1d/dav1d.h +++ b/include/dav1d/dav1d.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_H__ -#define __DAV1D_H__ +#ifndef DAV1D_H +#define DAV1D_H #ifdef __cplusplus extern "C" { @@ -201,4 +201,4 @@ DAV1D_API void dav1d_flush(Dav1dContext *c); } # endif -#endif /* __DAV1D_H__ */ +#endif /* DAV1D_H */ diff --git a/include/dav1d/headers.h b/include/dav1d/headers.h index f50a82e..2152650 100644 --- a/include/dav1d/headers.h +++ b/include/dav1d/headers.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_HEADERS_H__ -#define __DAV1D_HEADERS_H__ +#ifndef DAV1D_HEADERS_H +#define DAV1D_HEADERS_H // Constants from Section 3. "Symbols and abbreviated terms" #define DAV1D_MAX_CDEF_STRENGTHS 8 @@ -382,4 +382,4 @@ typedef struct Dav1dFrameHeader { Dav1dWarpedMotionParams gmv[DAV1D_REFS_PER_FRAME]; } Dav1dFrameHeader; -#endif /* __DAV1D_HEADERS_H__ */ +#endif /* DAV1D_HEADERS_H */ diff --git a/include/dav1d/picture.h b/include/dav1d/picture.h index 7627f4d..f4354b1 100644 --- a/include/dav1d/picture.h +++ b/include/dav1d/picture.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_PICTURE_H__ -#define __DAV1D_PICTURE_H__ +#ifndef DAV1D_PICTURE_H +#define DAV1D_PICTURE_H #include <stddef.h> #include <stdint.h> @@ -108,4 +108,4 @@ typedef struct Dav1dPicAllocator { */ DAV1D_API void dav1d_picture_unref(Dav1dPicture *p); -#endif /* __DAV1D_PICTURE_H__ */ +#endif /* DAV1D_PICTURE_H */ diff --git a/src/arm/32/util.S b/src/arm/32/util.S index 30121ea..b86b268 100644 --- a/src/arm/32/util.S +++ b/src/arm/32/util.S @@ -26,8 +26,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#ifndef __DAVID_SRC_ARM_32_UTIL_S__ -#define __DAVID_SRC_ARM_32_UTIL_S__ +#ifndef DAVID_SRC_ARM_32_UTIL_S +#define DAVID_SRC_ARM_32_UTIL_S #include "config.h" #include "src/arm/asm.S" @@ -63,4 +63,4 @@ #endif .endm -#endif /* __DAVID_SRC_ARM_32_UTIL_S__ */ +#endif /* DAVID_SRC_ARM_32_UTIL_S */ diff --git a/src/arm/64/util.S b/src/arm/64/util.S index fa8f0be..1181a6e 100644 --- a/src/arm/64/util.S +++ b/src/arm/64/util.S @@ -26,8 +26,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *****************************************************************************/ -#ifndef __DAVID_SRC_ARM_64_UTIL_S__ -#define __DAVID_SRC_ARM_64_UTIL_S__ +#ifndef DAVID_SRC_ARM_64_UTIL_S +#define DAVID_SRC_ARM_64_UTIL_S #include "config.h" #include "src/arm/asm.S" @@ -59,4 +59,4 @@ #endif .endm -#endif /* __DAVID_SRC_ARM_64_UTIL_S__ */ +#endif /* DAVID_SRC_ARM_64_UTIL_S */ diff --git a/src/arm/asm.S b/src/arm/asm.S index f9530bf..682e6ad 100644 --- a/src/arm/asm.S +++ b/src/arm/asm.S @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_ARM_ASM_S__ -#define __DAV1D_SRC_ARM_ASM_S__ +#ifndef DAV1D_SRC_ARM_ASM_S +#define DAV1D_SRC_ARM_ASM_S #include "config.h" @@ -134,4 +134,4 @@ EXTERN\name: #define X(x) CONCAT(EXTERN, x) -#endif /* __DAV1D_SRC_ARM_ASM_S__ */ +#endif /* DAV1D_SRC_ARM_ASM_S */ diff --git a/src/arm/cpu.h b/src/arm/cpu.h index 4788901..8c10a1b 100644 --- a/src/arm/cpu.h +++ b/src/arm/cpu.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_ARM_CPU_H__ -#define __DAV1D_SRC_ARM_CPU_H__ +#ifndef DAV1D_SRC_ARM_CPU_H +#define DAV1D_SRC_ARM_CPU_H enum CpuFlags { DAV1D_ARM_CPU_FLAG_NEON = 1 << 0, @@ -34,4 +34,4 @@ enum CpuFlags { unsigned dav1d_get_cpu_flags_arm(void); -#endif /* __DAV1D_SRC_ARM_CPU_H__ */ +#endif /* DAV1D_SRC_ARM_CPU_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_CDEF_H__ -#define __DAV1D_SRC_CDEF_H__ +#ifndef DAV1D_SRC_CDEF_H +#define DAV1D_SRC_CDEF_H #include <stddef.h> #include <stdint.h> @@ -69,4 +69,4 @@ bitfn_decls(void dav1d_cdef_dsp_init, Dav1dCdefDSPContext *c); bitfn_decls(void dav1d_cdef_dsp_init_arm, Dav1dCdefDSPContext *c); bitfn_decls(void dav1d_cdef_dsp_init_x86, Dav1dCdefDSPContext *c); -#endif /* __DAV1D_SRC_CDEF_H__ */ +#endif /* DAV1D_SRC_CDEF_H */ diff --git a/src/cdef_apply.h b/src/cdef_apply.h index 912812d..ffdffba 100644 --- a/src/cdef_apply.h +++ b/src/cdef_apply.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_CDEF_APPLY_H__ -#define __DAV1D_SRC_CDEF_APPLY_H__ +#ifndef DAV1D_SRC_CDEF_APPLY_H +#define DAV1D_SRC_CDEF_APPLY_H #include "common/bitdepth.h" @@ -35,4 +35,4 @@ void bytefn(dav1d_cdef_brow)(Dav1dFrameContext *f, pixel *const p[3], const Av1Filter *lflvl, int by_start, int by_end); -#endif /* __DAV1D_SRC_CDEF_APPLY_H__ */ +#endif /* DAV1D_SRC_CDEF_APPLY_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_CDF_H__ -#define __DAV1D_SRC_CDF_H__ +#ifndef DAV1D_SRC_CDF_H +#define DAV1D_SRC_CDF_H #include <stdint.h> @@ -148,4 +148,4 @@ void dav1d_cdf_thread_update(const Dav1dFrameHeader *hdr, CdfContext *dst, void dav1d_cdf_thread_wait(CdfThreadContext *cdf); void dav1d_cdf_thread_signal(CdfThreadContext *cdf); -#endif /* __DAV1D_SRC_CDF_H__ */ +#endif /* DAV1D_SRC_CDF_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_CPU_H__ -#define __DAV1D_SRC_CPU_H__ +#ifndef DAV1D_SRC_CPU_H +#define DAV1D_SRC_CPU_H #include "config.h" @@ -41,4 +41,4 @@ unsigned dav1d_get_cpu_flags(void); DAV1D_API void dav1d_set_cpu_flags_mask(const unsigned mask); -#endif /* __DAV1D_SRC_CPU_H__ */ +#endif /* DAV1D_SRC_CPU_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_CTX_H__ -#define __DAV1D_SRC_CTX_H__ +#ifndef DAV1D_SRC_CTX_H +#define DAV1D_SRC_CTX_H #include <stdint.h> @@ -88,4 +88,4 @@ union alias8 { uint8_t u8; } ATTR_ALIAS; default: default_memset(dir, diridx, off, var); break; \ } -#endif /* __DAV1D_SRC_CTX_H__ */ +#endif /* DAV1D_SRC_CTX_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_DATA_H__ -#define __DAV1D_SRC_DATA_H__ +#ifndef DAV1D_SRC_DATA_H +#define DAV1D_SRC_DATA_H #include "dav1d/data.h" @@ -57,4 +57,4 @@ int dav1d_data_wrap_user_data_internal(Dav1dData *buf, void *cookie); void dav1d_data_unref_internal(Dav1dData *buf); -#endif /* __DAV1D_SRC_DATA_H__ */ +#endif /* DAV1D_SRC_DATA_H */ diff --git a/src/decode.h b/src/decode.h index 82b4d51..1eae585 100644 --- a/src/decode.h +++ b/src/decode.h @@ -25,11 +25,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_DECODE_H__ -#define __DAV1D_SRC_DECODE_H__ +#ifndef DAV1D_SRC_DECODE_H +#define DAV1D_SRC_DECODE_H #include "src/internal.h" int dav1d_submit_frame(Dav1dContext *c); -#endif /* __DAV1D_SRC_DECODE_H__ */ +#endif /* DAV1D_SRC_DECODE_H */ diff --git a/src/dequant_tables.h b/src/dequant_tables.h index 82b4fdc..66bb3b5 100644 --- a/src/dequant_tables.h +++ b/src/dequant_tables.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_DEQUANT_TABLES_H__ -#define __DAV1D_SRC_DEQUANT_TABLES_H__ +#ifndef DAV1D_SRC_DEQUANT_TABLES_H +#define DAV1D_SRC_DEQUANT_TABLES_H #include <stdint.h> @@ -34,4 +34,4 @@ extern const uint16_t dav1d_dq_tbl[][QINDEX_RANGE][2]; -#endif /* __DAV1D_SRC_DEQUANT_TABLES_H__ */ +#endif /* DAV1D_SRC_DEQUANT_TABLES_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_ENV_H__ -#define __DAV1D_SRC_ENV_H__ +#ifndef DAV1D_SRC_ENV_H +#define DAV1D_SRC_ENV_H #include <assert.h> #include <stddef.h> @@ -754,4 +754,4 @@ static inline mv get_gmv_2d(const Dav1dWarpedMotionParams *const gmv, } } -#endif /* __DAV1D_SRC_ENV_H__ */ +#endif /* DAV1D_SRC_ENV_H */ diff --git a/src/film_grain.h b/src/film_grain.h index 1519f12..61e61d3 100644 --- a/src/film_grain.h +++ b/src/film_grain.h @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_FILM_GRAIN_H__ -#define __DAV1D_SRC_FILM_GRAIN_H__ +#ifndef DAV1D_SRC_FILM_GRAIN_H +#define DAV1D_SRC_FILM_GRAIN_H #include "dav1d/dav1d.h" bitfn_decls(void dav1d_apply_grain, Dav1dPicture *const out, const Dav1dPicture *const in); -#endif /* __DAV1D_SRC_FILM_GRAIN_H__ */ +#endif /* DAV1D_SRC_FILM_GRAIN_H */ diff --git a/src/getbits.h b/src/getbits.h index 474bd14..e531ad5 100644 --- a/src/getbits.h +++ b/src/getbits.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_GETBITS_H__ -#define __DAV1D_SRC_GETBITS_H__ +#ifndef DAV1D_SRC_GETBITS_H +#define DAV1D_SRC_GETBITS_H #include <stddef.h> #include <stdint.h> @@ -55,4 +55,4 @@ static inline unsigned dav1d_get_bits_pos(const GetBits *c) { return (unsigned) (c->ptr - c->ptr_start) * 8 - c->bits_left; } -#endif /* __DAV1D_SRC_GETBITS_H__ */ +#endif /* DAV1D_SRC_GETBITS_H */ diff --git a/src/internal.h b/src/internal.h index b2f5429..9833d52 100644 --- a/src/internal.h +++ b/src/internal.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_INTERNAL_H__ -#define __DAV1D_SRC_INTERNAL_H__ +#ifndef DAV1D_SRC_INTERNAL_H +#define DAV1D_SRC_INTERNAL_H #include <stdatomic.h> @@ -301,4 +301,4 @@ struct Dav1dTileContext { } tile_thread; }; -#endif /* __DAV1D_SRC_INTERNAL_H__ */ +#endif /* DAV1D_SRC_INTERNAL_H */ diff --git a/src/intra_edge.h b/src/intra_edge.h index 8b0c6ee..8b4e150 100644 --- a/src/intra_edge.h +++ b/src/intra_edge.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_INTRA_EDGE_H__ -#define __DAV1D_SRC_INTRA_EDGE_H__ +#ifndef DAV1D_SRC_INTRA_EDGE_H +#define DAV1D_SRC_INTRA_EDGE_H enum EdgeFlags { EDGE_I444_TOP_HAS_RIGHT = 1 << 0, @@ -54,4 +54,4 @@ typedef struct EdgeBranch { void dav1d_init_mode_tree(EdgeNode *const root, EdgeTip *const nt, const int allow_sb128); -#endif /* __DAV1D_SRC_INTRA_EDGE_H__ */ +#endif /* DAV1D_SRC_INTRA_EDGE_H */ diff --git a/src/ipred.h b/src/ipred.h index 50fa826..c980c22 100644 --- a/src/ipred.h +++ b/src/ipred.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_IPRED_H__ -#define __DAV1D_SRC_IPRED_H__ +#ifndef DAV1D_SRC_IPRED_H +#define DAV1D_SRC_IPRED_H #include <stddef.h> @@ -91,4 +91,4 @@ typedef struct Dav1dIntraPredDSPContext { bitfn_decls(void dav1d_intra_pred_dsp_init, Dav1dIntraPredDSPContext *c); bitfn_decls(void dav1d_intra_pred_dsp_init_x86, Dav1dIntraPredDSPContext *c); -#endif /* __DAV1D_SRC_IPRED_H__ */ +#endif /* DAV1D_SRC_IPRED_H */ diff --git a/src/ipred_prepare.h b/src/ipred_prepare.h index 393b7c0..dbc88e5 100644 --- a/src/ipred_prepare.h +++ b/src/ipred_prepare.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_IPRED_PREPARE_H__ -#define __DAV1D_SRC_IPRED_PREPARE_H__ +#ifndef DAV1D_SRC_IPRED_PREPARE_H +#define DAV1D_SRC_IPRED_PREPARE_H #include <stddef.h> #include <stdint.h> @@ -105,4 +105,4 @@ static inline int sm_uv_flag(const BlockContext *const b, const int idx) { m == SMOOTH_V_PRED) ? ANGLE_SMOOTH_EDGE_FLAG : 0; } -#endif /* __DAV1D_SRC_IPRED_PREPARE_H__ */ +#endif /* DAV1D_SRC_IPRED_PREPARE_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_ITX_H__ -#define __DAV1D_SRC_ITX_H__ +#ifndef DAV1D_SRC_ITX_H +#define DAV1D_SRC_ITX_H #include <stddef.h> @@ -46,4 +46,4 @@ typedef struct Dav1dInvTxfmDSPContext { bitfn_decls(void dav1d_itx_dsp_init, Dav1dInvTxfmDSPContext *c); bitfn_decls(void dav1d_itx_dsp_init_x86, Dav1dInvTxfmDSPContext *c); -#endif /* __DAV1D_SRC_ITX_H__ */ +#endif /* DAV1D_SRC_ITX_H */ diff --git a/src/levels.h b/src/levels.h index 5f762f0..17aa8ba 100644 --- a/src/levels.h +++ b/src/levels.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LEVELS_H__ -#define __DAV1D_SRC_LEVELS_H__ +#ifndef DAV1D_SRC_LEVELS_H +#define DAV1D_SRC_LEVELS_H #include <stdint.h> @@ -281,4 +281,4 @@ typedef struct Av1Block { }; } Av1Block; -#endif /* __DAV1D_SRC_LEVELS_H__ */ +#endif /* DAV1D_SRC_LEVELS_H */ diff --git a/src/lf_apply.h b/src/lf_apply.h index 580aafb..6b63b62 100644 --- a/src/lf_apply.h +++ b/src/lf_apply.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LF_APPLY_H__ -#define __DAV1D_SRC_LF_APPLY_H__ +#ifndef DAV1D_SRC_LF_APPLY_H +#define DAV1D_SRC_LF_APPLY_H #include <stdint.h> @@ -39,4 +39,4 @@ void bytefn(dav1d_loopfilter_sbrow)(const Dav1dFrameContext *f, pixel *const p[3], Av1Filter *lflvl, int sby, int start_of_tile_row); -#endif /* __DAV1D_SRC_LF_APPLY_H__ */ +#endif /* DAV1D_SRC_LF_APPLY_H */ diff --git a/src/lf_mask.h b/src/lf_mask.h index 32124ec..3957481 100644 --- a/src/lf_mask.h +++ b/src/lf_mask.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LF_MASK_H__ -#define __DAV1D_SRC_LF_MASK_H__ +#ifndef DAV1D_SRC_LF_MASK_H +#define DAV1D_SRC_LF_MASK_H #include <stddef.h> #include <stdint.h> @@ -82,4 +82,4 @@ void dav1d_calc_eih(Av1FilterLUT *lim_lut, int filter_sharpness); void dav1d_calc_lf_values(uint8_t (*values)[4][8][2], const Dav1dFrameHeader *hdr, const int8_t lf_delta[4]); -#endif /* __DAV1D_SRC_LF_MASK_H__ */ +#endif /* DAV1D_SRC_LF_MASK_H */ @@ -24,8 +24,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LOG_H__ -#define __DAV1D_SRC_LOG_H__ +#ifndef DAV1D_SRC_LOG_H +#define DAV1D_SRC_LOG_H #include "config.h" @@ -44,4 +44,4 @@ void dav1d_log(Dav1dContext *c, const char *format, ...) ATTR_FORMAT_PRINTF(2, 3 #define dav1d_log(...) do { } while(0) #endif -#endif /* __DAV1D_SRC_LOG_H__ */ +#endif /* DAV1D_SRC_LOG_H */ diff --git a/src/loopfilter.h b/src/loopfilter.h index ada9404..7f8fd13 100644 --- a/src/loopfilter.h +++ b/src/loopfilter.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LOOPFILTER_H__ -#define __DAV1D_SRC_LOOPFILTER_H__ +#ifndef DAV1D_SRC_LOOPFILTER_H +#define DAV1D_SRC_LOOPFILTER_H #include <stdint.h> #include <stddef.h> @@ -55,4 +55,4 @@ typedef struct Dav1dLoopFilterDSPContext { bitfn_decls(void dav1d_loop_filter_dsp_init, Dav1dLoopFilterDSPContext *c); bitfn_decls(void dav1d_loop_filter_dsp_init_x86, Dav1dLoopFilterDSPContext *c); -#endif /* __DAV1D_SRC_LOOPFILTER_H__ */ +#endif /* DAV1D_SRC_LOOPFILTER_H */ diff --git a/src/looprestoration.h b/src/looprestoration.h index 6bd8dd5..bf1dea0 100644 --- a/src/looprestoration.h +++ b/src/looprestoration.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LOOPRESTORATION_H__ -#define __DAV1D_SRC_LOOPRESTORATION_H__ +#ifndef DAV1D_SRC_LOOPRESTORATION_H +#define DAV1D_SRC_LOOPRESTORATION_H #include <stdint.h> #include <stddef.h> @@ -76,4 +76,4 @@ bitfn_decls(void dav1d_loop_restoration_dsp_init, Dav1dLoopRestorationDSPContext bitfn_decls(void dav1d_loop_restoration_dsp_init_arm, Dav1dLoopRestorationDSPContext *c); bitfn_decls(void dav1d_loop_restoration_dsp_init_x86, Dav1dLoopRestorationDSPContext *c); -#endif /* __DAV1D_SRC_LOOPRESTORATION_H__ */ +#endif /* DAV1D_SRC_LOOPRESTORATION_H */ diff --git a/src/lr_apply.h b/src/lr_apply.h index 67a7a21..638bb8b 100644 --- a/src/lr_apply.h +++ b/src/lr_apply.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_LR_APPLY_H__ -#define __DAV1D_SRC_LR_APPLY_H__ +#ifndef DAV1D_SRC_LR_APPLY_H +#define DAV1D_SRC_LR_APPLY_H #include <stdint.h> #include <stddef.h> @@ -41,4 +41,4 @@ void bytefn(dav1d_lr_copy_lpf)(Dav1dFrameContext *const f, void bytefn(dav1d_lr_sbrow)(Dav1dFrameContext *const f, pixel *const dst[3], int sby); -#endif /* __DAV1D_SRC_LR_APPLY_H__ */ +#endif /* DAV1D_SRC_LR_APPLY_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_MC_H__ -#define __DAV1D_SRC_MC_H__ +#ifndef DAV1D_SRC_MC_H +#define DAV1D_SRC_MC_H #include <stdint.h> #include <stddef.h> @@ -135,4 +135,4 @@ bitfn_decls(void dav1d_mc_dsp_init, Dav1dMCDSPContext *c); bitfn_decls(void dav1d_mc_dsp_init_arm, Dav1dMCDSPContext *c); bitfn_decls(void dav1d_mc_dsp_init_x86, Dav1dMCDSPContext *c); -#endif /* __DAV1D_SRC_MC_H__ */ +#endif /* DAV1D_SRC_MC_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_MSAC_H__ -#define __DAV1D_SRC_MSAC_H__ +#ifndef DAV1D_SRC_MSAC_H +#define DAV1D_SRC_MSAC_H #include <stdint.h> #include <stdlib.h> @@ -55,4 +55,4 @@ unsigned msac_decode_bools(MsacContext *c, unsigned l); int msac_decode_subexp(MsacContext *c, int ref, int n, unsigned k); int msac_decode_uniform(MsacContext *c, unsigned n); -#endif /* __DAV1D_SRC_MSAC_H__ */ +#endif /* DAV1D_SRC_MSAC_H */ @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_OBU_H__ -#define __DAV1D_SRC_OBU_H__ +#ifndef DAV1D_SRC_OBU_H +#define DAV1D_SRC_OBU_H #include "dav1d/data.h" #include "src/internal.h" int dav1d_parse_obus(Dav1dContext *c, Dav1dData *in, int global); -#endif /* __DAV1D_SRC_OBU_H__ */ +#endif /* DAV1D_SRC_OBU_H */ diff --git a/src/picture.h b/src/picture.h index dbb8d3e..22b6f2b 100644 --- a/src/picture.h +++ b/src/picture.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_PICTURE_H__ -#define __DAV1D_SRC_PICTURE_H__ +#ifndef DAV1D_SRC_PICTURE_H +#define DAV1D_SRC_PICTURE_H #include <stdatomic.h> @@ -109,4 +109,4 @@ int default_picture_allocator(Dav1dPicture *, void *cookie); void default_picture_release(Dav1dPicture *, void *cookie); void dav1d_picture_unref_internal(Dav1dPicture *p); -#endif /* __DAV1D_SRC_PICTURE_H__ */ +#endif /* DAV1D_SRC_PICTURE_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_QM_H__ -#define __DAV1D_SRC_QM_H__ +#ifndef DAV1D_SRC_QM_H +#define DAV1D_SRC_QM_H #include "src/levels.h" @@ -34,4 +34,4 @@ extern const uint8_t *dav1d_qm_tbl[16][2][N_RECT_TX_SIZES]; void dav1d_init_qm_tables(void); -#endif /* __DAV1D_SRC_QM_H__ */ +#endif /* DAV1D_SRC_QM_H */ diff --git a/src/recon.h b/src/recon.h index 60d7779..f84c8ab 100644 --- a/src/recon.h +++ b/src/recon.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_RECON_H__ -#define __DAV1D_SRC_RECON_H__ +#ifndef DAV1D_SRC_RECON_H +#define DAV1D_SRC_RECON_H #include "src/internal.h" #include "src/levels.h" @@ -72,4 +72,4 @@ decl_backup_ipred_edge_fn(dav1d_backup_ipred_edge_16bpc); decl_read_coef_blocks_fn(dav1d_read_coef_blocks_8bpc); decl_read_coef_blocks_fn(dav1d_read_coef_blocks_16bpc); -#endif /* __DAV1D_SRC_RECON_H__ */ +#endif /* DAV1D_SRC_RECON_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_REF_H__ -#define __DAV1D_SRC_REF_H__ +#ifndef DAV1D_SRC_REF_H +#define DAV1D_SRC_REF_H #include "dav1d/dav1d.h" @@ -50,4 +50,4 @@ void dav1d_ref_dec(Dav1dRef **ref); int dav1d_ref_is_writable(Dav1dRef *ref); -#endif /* __DAV1D_SRC_REF_H__ */ +#endif /* DAV1D_SRC_REF_H */ diff --git a/src/ref_mvs.h b/src/ref_mvs.h index 3ce06b4..d3d6b33 100644 --- a/src/ref_mvs.h +++ b/src/ref_mvs.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef __DAV1D_SRC_REF_MVS_H__ -#define __DAV1D_SRC_REF_MVS_H__ +#ifndef DAV1D_SRC_REF_MVS_H +#define DAV1D_SRC_REF_MVS_H #include <stddef.h> @@ -178,4 +178,4 @@ static inline void fix_mv_precision(const Dav1dFrameHeader *const hdr, } } -#endif /* __DAV1D_SRC_REF_MVS_H__ */ +#endif /* DAV1D_SRC_REF_MVS_H */ @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SCAN_H__ -#define __DAV1D_SCAN_H__ +#ifndef DAV1D_SRC_SCAN_H +#define DAV1D_SRC_SCAN_H #include <stdint.h> @@ -34,4 +34,4 @@ extern const int16_t *const dav1d_scans[N_RECT_TX_SIZES][3]; -#endif /* __DAV1D_SCAN_H__ */ +#endif /* DAV1D_SRC_SCAN_H */ diff --git a/src/tables.h b/src/tables.h index fb74665..d2a046c 100644 --- a/src/tables.h +++ b/src/tables.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_TABLES_H__ -#define __DAV1D_SRC_TABLES_H__ +#ifndef DAV1D_SRC_TABLES_H +#define DAV1D_SRC_TABLES_H #include <stdint.h> @@ -121,4 +121,4 @@ extern const uint8_t dav1d_obmc_masks[64]; extern const int16_t dav1d_gaussian_sequence[2048]; // for fgs -#endif /* __DAV1D_SRC_TABLES_H__ */ +#endif /* DAV1D_SRC_TABLES_H */ diff --git a/src/thread.h b/src/thread.h index 4012bb0..f8da628 100644 --- a/src/thread.h +++ b/src/thread.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_THREAD_H__ -#define __DAV1D_THREAD_H__ +#ifndef DAV1D_SRC_THREAD_H +#define DAV1D_SRC_THREAD_H #if defined(_WIN32) @@ -108,4 +108,4 @@ static inline int pthread_cond_broadcast(pthread_cond_t *const cond) { #endif -#endif /* __DAV1D_THREAD_H__ */ +#endif /* DAV1D_SRC_THREAD_H */ diff --git a/src/thread_data.h b/src/thread_data.h index 65d0ac9..62814e6 100644 --- a/src/thread_data.h +++ b/src/thread_data.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_THREAD_DATA_H__ -#define __DAV1D_SRC_THREAD_DATA_H__ +#ifndef DAV1D_SRC_THREAD_DATA_H +#define DAV1D_SRC_THREAD_DATA_H #include "src/thread.h" @@ -37,4 +37,4 @@ struct thread_data { int inited; }; -#endif /* __DAV1D_SRC_THREAD_DATA_H__ */ +#endif /* DAV1D_SRC_THREAD_DATA_H */ diff --git a/src/thread_task.h b/src/thread_task.h index 2d27f25..309a714 100644 --- a/src/thread_task.h +++ b/src/thread_task.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_THREAD_TASK_H__ -#define __DAV1D_SRC_THREAD_TASK_H__ +#ifndef DAV1D_SRC_THREAD_TASK_H +#define DAV1D_SRC_THREAD_TASK_H #include <limits.h> @@ -41,4 +41,4 @@ void *dav1d_frame_task(void *data); int dav1d_decode_tile_sbrow(Dav1dTileContext *t); void *dav1d_tile_task(void *data); -#endif /* __DAV1D_SRC_THREAD_TASK_H__ */ +#endif /* DAV1D_SRC_THREAD_TASK_H */ diff --git a/src/warpmv.h b/src/warpmv.h index bffb4f2..f1da614 100644 --- a/src/warpmv.h +++ b/src/warpmv.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_WARPMV_H__ -#define __DAV1D_SRC_WARPMV_H__ +#ifndef DAV1D_SRC_WARPMV_H +#define DAV1D_SRC_WARPMV_H #include "src/levels.h" @@ -34,4 +34,4 @@ int dav1d_get_shear_params(Dav1dWarpedMotionParams *wm); int dav1d_find_affine_int(const int (*pts)[2][2], int np, int bw4, int bh4, mv mv, Dav1dWarpedMotionParams *wm, int by, int bx); -#endif /* __DAV1D_SRC_WARPMV_H__ */ +#endif /* DAV1D_SRC_WARPMV_H */ diff --git a/src/wedge.h b/src/wedge.h index 787ff33..45f0570 100644 --- a/src/wedge.h +++ b/src/wedge.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_WEDGE_H__ -#define __DAV1D_SRC_WEDGE_H__ +#ifndef DAV1D_SRC_WEDGE_H +#define DAV1D_SRC_WEDGE_H #include "src/levels.h" @@ -38,4 +38,4 @@ void dav1d_init_interintra_masks(void); extern const uint8_t *dav1d_ii_masks[N_BS_SIZES][3 /* 444/luma, 422, 420 */] [N_INTER_INTRA_PRED_MODES]; -#endif /* __DAV1D_SRC_WEDGE_H__ */ +#endif /* DAV1D_SRC_WEDGE_H */ diff --git a/src/x86/cpu.h b/src/x86/cpu.h index e630d97..2beae78 100644 --- a/src/x86/cpu.h +++ b/src/x86/cpu.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_SRC_X86_CPU_H__ -#define __DAV1D_SRC_X86_CPU_H__ +#ifndef DAV1D_SRC_X86_CPU_H +#define DAV1D_SRC_X86_CPU_H enum CpuFlags { DAV1D_X86_CPU_FLAG_SSE = 1 << 0, @@ -42,4 +42,4 @@ enum CpuFlags { unsigned dav1d_get_cpu_flags_x86(void); -#endif /* __DAV1D_SRC_X86_CPU_H__ */ +#endif /* DAV1D_SRC_X86_CPU_H */ diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 018fc9e..7adc40c 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_TESTS_CHECKASM_CHECKASM_H -#define __DAV1D_TESTS_CHECKASM_CHECKASM_H +#ifndef DAV1D_TESTS_CHECKASM_CHECKASM_H +#define DAV1D_TESTS_CHECKASM_CHECKASM_H #include "config.h" @@ -262,4 +262,4 @@ void checkasm_stack_clobber(uint64_t clobber, ...); #define bench_new(...) while (0) #endif -#endif /* __DAV1D_TESTS_CHECKASM_CHECKASM_H */ +#endif /* DAV1D_TESTS_CHECKASM_CHECKASM_H */ diff --git a/tests/libfuzzer/dav1d_fuzzer.h b/tests/libfuzzer/dav1d_fuzzer.h index 201d056..5d93299 100644 --- a/tests/libfuzzer/dav1d_fuzzer.h +++ b/tests/libfuzzer/dav1d_fuzzer.h @@ -25,12 +25,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H -#define __DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H +#ifndef DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H +#define DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H #include <stddef.h> #include <stdint.h> int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); -#endif /* __DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H*/ +#endif /* DAV1D_TESTS_LIBFUZZER_DAV1D_FUZZER_H */ diff --git a/tools/dav1d_cli_parse.h b/tools/dav1d_cli_parse.h index d7c78f9..9ab42a4 100644 --- a/tools/dav1d_cli_parse.h +++ b/tools/dav1d_cli_parse.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_CLI_PARSE_H__ -#define __DAV1D_CLI_PARSE_H__ +#ifndef DAV1D_CLI_PARSE_H +#define DAV1D_CLI_PARSE_H #include "dav1d.h" @@ -43,4 +43,4 @@ typedef struct { void parse(const int argc, char *const *const argv, CLISettings *const cli_settings, Dav1dSettings *const lib_settings); -#endif /* __DAV1D_CLI_PARSE_H__ */ +#endif /* DAV1D_CLI_PARSE_H */ diff --git a/tools/input/demuxer.h b/tools/input/demuxer.h index 8fdf6ed..96456d7 100644 --- a/tools/input/demuxer.h +++ b/tools/input/demuxer.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_INPUT_DEMUXER_H__ -#define __DAV1D_INPUT_DEMUXER_H__ +#ifndef DAV1D_INPUT_DEMUXER_H +#define DAV1D_INPUT_DEMUXER_H #include "data.h" @@ -41,4 +41,4 @@ typedef struct Demuxer { void (*close)(DemuxerPriv *ctx); } Demuxer; -#endif /* __DAV1D_INPUT_DEMUXER_H__ */ +#endif /* DAV1D_INPUT_DEMUXER_H */ diff --git a/tools/input/input.h b/tools/input/input.h index 67ce547..9bd2982 100644 --- a/tools/input/input.h +++ b/tools/input/input.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_INPUT_INPUT_H__ -#define __DAV1D_INPUT_INPUT_H__ +#ifndef DAV1D_INPUT_INPUT_H +#define DAV1D_INPUT_INPUT_H #include "data.h" @@ -39,4 +39,4 @@ int input_open(DemuxerContext **const c_out, int input_read(DemuxerContext *ctx, Dav1dData *data); void input_close(DemuxerContext *ctx); -#endif /* __DAV1D_INPUT_INPUT_H__ */ +#endif /* DAV1D_INPUT_INPUT_H */ diff --git a/tools/output/muxer.h b/tools/output/muxer.h index 2bc340f..54b3f6a 100644 --- a/tools/output/muxer.h +++ b/tools/output/muxer.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_OUTPUT_MUXER_H__ -#define __DAV1D_OUTPUT_MUXER_H__ +#ifndef DAV1D_OUTPUT_MUXER_H +#define DAV1D_OUTPUT_MUXER_H #include "picture.h" @@ -49,4 +49,4 @@ typedef struct Muxer { int (*verify)(MuxerPriv *ctx, const char *hash_string); } Muxer; -#endif /* __DAV1D_OUTPUT_MUXER_H__ */ +#endif /* DAV1D_OUTPUT_MUXER_H */ diff --git a/tools/output/output.h b/tools/output/output.h index 9eefaf8..c252d64 100644 --- a/tools/output/output.h +++ b/tools/output/output.h @@ -25,8 +25,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DAV1D_OUTPUT_OUTPUT_H__ -#define __DAV1D_OUTPUT_OUTPUT_H__ +#ifndef DAV1D_OUTPUT_OUTPUT_H +#define DAV1D_OUTPUT_OUTPUT_H #include "picture.h" @@ -46,4 +46,4 @@ void output_close(MuxerContext *ctx); */ int output_verify(MuxerContext *ctx, const char *hash_string); -#endif /* __DAV1D_OUTPUT_OUTPUT_H__ */ +#endif /* DAV1D_OUTPUT_OUTPUT_H */ |