Skip to content
Snippets Groups Projects
Commit 98790382 authored by Stefano Sabatini's avatar Stefano Sabatini
Browse files

Globally rename the header inclusion guard names.

Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f0319383
No related branches found
No related tags found
No related merge requests found
Showing
with 60 additions and 60 deletions
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
* @author Maxim Gavrilov ( maxim.gavrilov gmail com ) * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
*/ */
#ifndef FFMPEG_AAC_H #ifndef AVCODEC_AAC_H
#define FFMPEG_AAC_H #define AVCODEC_AAC_H
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
...@@ -272,4 +272,4 @@ typedef struct { ...@@ -272,4 +272,4 @@ typedef struct {
} AACContext; } AACContext;
#endif /* FFMPEG_AAC_H */ #endif /* AVCODEC_AAC_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AAC_AC3_PARSER_H #ifndef AVCODEC_AAC_AC3_PARSER_H
#define FFMPEG_AAC_AC3_PARSER_H #define AVCODEC_AAC_AC3_PARSER_H
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
...@@ -50,4 +50,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, ...@@ -50,4 +50,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
const uint8_t **poutbuf, int *poutbuf_size, const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size); const uint8_t *buf, int buf_size);
#endif /* FFMPEG_AAC_AC3_PARSER_H */ #endif /* AVCODEC_AAC_AC3_PARSER_H */
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
* @author Maxim Gavrilov ( maxim.gavrilov gmail com ) * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
*/ */
#ifndef FFMPEG_AACDECTAB_H #ifndef AVCODEC_AACDECTAB_H
#define FFMPEG_AACDECTAB_H #define AVCODEC_AACDECTAB_H
#include "aac.h" #include "aac.h"
...@@ -206,4 +206,4 @@ static const float *tns_tmp2_map[4] = { ...@@ -206,4 +206,4 @@ static const float *tns_tmp2_map[4] = {
}; };
// @} // @}
#endif /* FFMPEG_AACDECTAB_H */ #endif /* AVCODEC_AACDECTAB_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AACPSY_H #ifndef AVCODEC_AACPSY_H
#define FFMPEG_AACPSY_H #define AVCODEC_AACPSY_H
#include "avcodec.h" #include "avcodec.h"
#include "aac.h" #include "aac.h"
...@@ -47,4 +47,4 @@ typedef struct AACPsyContext { ...@@ -47,4 +47,4 @@ typedef struct AACPsyContext {
*/ */
void ff_aac_psy_end(AACPsyContext *ctx); void ff_aac_psy_end(AACPsyContext *ctx);
#endif /* FFMPEG_AACPSY_H */ #endif /* AVCODEC_AACPSY_H */
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
* @author Maxim Gavrilov ( maxim.gavrilov gmail com ) * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
*/ */
#ifndef FFMPEG_AACTAB_H #ifndef AVCODEC_AACTAB_H
#define FFMPEG_AACTAB_H #define AVCODEC_AACTAB_H
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "aac.h" #include "aac.h"
...@@ -69,4 +69,4 @@ extern const float ff_aac_pow2sf_tab[316]; ...@@ -69,4 +69,4 @@ extern const float ff_aac_pow2sf_tab[316];
extern float ff_aac_pow2sf_tab[316]; extern float ff_aac_pow2sf_tab[316];
#endif /* CONFIG_HARDCODED_TABLES */ #endif /* CONFIG_HARDCODED_TABLES */
#endif /* FFMPEG_AACTAB_H */ #endif /* AVCODEC_AACTAB_H */
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* Common code between the AC-3 encoder and decoder. * Common code between the AC-3 encoder and decoder.
*/ */
#ifndef FFMPEG_AC3_H #ifndef AVCODEC_AC3_H
#define FFMPEG_AC3_H #define AVCODEC_AC3_H
#include "ac3tab.h" #include "ac3tab.h"
...@@ -182,4 +182,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap, ...@@ -182,4 +182,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
uint8_t *dba_offsets, uint8_t *dba_lengths, uint8_t *dba_offsets, uint8_t *dba_lengths,
uint8_t *dba_values); uint8_t *dba_values);
#endif /* FFMPEG_AC3_H */ #endif /* AVCODEC_AC3_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AC3_PARSER_H #ifndef AVCODEC_AC3_PARSER_H
#define FFMPEG_AC3_PARSER_H #define AVCODEC_AC3_PARSER_H
#include "ac3.h" #include "ac3.h"
#include "bitstream.h" #include "bitstream.h"
...@@ -58,4 +58,4 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); ...@@ -58,4 +58,4 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
*/ */
int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr); int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr);
#endif /* FFMPEG_AC3_PARSER_H */ #endif /* AVCODEC_AC3_PARSER_H */
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
* Common code between the AC-3 and E-AC-3 decoders. * Common code between the AC-3 and E-AC-3 decoders.
*/ */
#ifndef FFMPEG_AC3DEC_H #ifndef AVCODEC_AC3DEC_H
#define FFMPEG_AC3DEC_H #define AVCODEC_AC3DEC_H
#include "libavutil/lfg.h" #include "libavutil/lfg.h"
#include "ac3.h" #include "ac3.h"
...@@ -179,4 +179,4 @@ int ff_eac3_parse_header(AC3DecodeContext *s); ...@@ -179,4 +179,4 @@ int ff_eac3_parse_header(AC3DecodeContext *s);
*/ */
void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch); void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);
#endif /* FFMPEG_AC3DEC_H */ #endif /* AVCODEC_AC3DEC_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AC3DEC_DATA_H #ifndef AVCODEC_AC3DEC_DATA_H
#define FFMPEG_AC3DEC_DATA_H #define AVCODEC_AC3DEC_DATA_H
#include "libavutil/common.h" #include "libavutil/common.h"
...@@ -37,4 +37,4 @@ extern const uint8_t ff_eac3_default_cpl_band_struct[18]; ...@@ -37,4 +37,4 @@ extern const uint8_t ff_eac3_default_cpl_band_struct[18];
extern const uint8_t ff_ac3_rematrix_band_tab[5]; extern const uint8_t ff_ac3_rematrix_band_tab[5];
#endif /* FFMPEG_AC3DEC_DATA_H */ #endif /* AVCODEC_AC3DEC_DATA_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AC3TAB_H #ifndef AVCODEC_AC3TAB_H
#define FFMPEG_AC3TAB_H #define AVCODEC_AC3TAB_H
#include "libavutil/common.h" #include "libavutil/common.h"
...@@ -56,4 +56,4 @@ enum CustomChannelMapLocation{ ...@@ -56,4 +56,4 @@ enum CustomChannelMapLocation{
AC3_CHMAP_LFE = 1<<(15-15) AC3_CHMAP_LFE = 1<<(15-15)
}; };
#endif /* FFMPEG_AC3TAB_H */ #endif /* AVCODEC_AC3TAB_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ACELP_FILTERS_H #ifndef AVCODEC_ACELP_FILTERS_H
#define FFMPEG_ACELP_FILTERS_H #define AVCODEC_ACELP_FILTERS_H
#include <stdint.h> #include <stdint.h>
...@@ -134,4 +134,4 @@ void ff_acelp_high_pass_filter( ...@@ -134,4 +134,4 @@ void ff_acelp_high_pass_filter(
const int16_t* in, const int16_t* in,
int length); int length);
#endif /* FFMPEG_ACELP_FILTERS_H */ #endif /* AVCODEC_ACELP_FILTERS_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ACELP_MATH_H #ifndef AVCODEC_ACELP_MATH_H
#define FFMPEG_ACELP_MATH_H #define AVCODEC_ACELP_MATH_H
#include <stdint.h> #include <stdint.h>
...@@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset) ...@@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset)
else return value << offset; else return value << offset;
} }
#endif /* FFMPEG_ACELP_MATH_H */ #endif /* AVCODEC_ACELP_MATH_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ACELP_PITCH_DELAY_H #ifndef AVCODEC_ACELP_PITCH_DELAY_H
#define FFMPEG_ACELP_PITCH_DELAY_H #define AVCODEC_ACELP_PITCH_DELAY_H
#include <stdint.h> #include <stdint.h>
...@@ -217,4 +217,4 @@ int16_t ff_acelp_decode_gain_code( ...@@ -217,4 +217,4 @@ int16_t ff_acelp_decode_gain_code(
int subframe_size, int subframe_size,
int max_pred_order); int max_pred_order);
#endif /* FFMPEG_ACELP_PITCH_DELAY_H */ #endif /* AVCODEC_ACELP_PITCH_DELAY_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ACELP_VECTORS_H #ifndef AVCODEC_ACELP_VECTORS_H
#define FFMPEG_ACELP_VECTORS_H #define AVCODEC_ACELP_VECTORS_H
#include <stdint.h> #include <stdint.h>
...@@ -150,4 +150,4 @@ void ff_acelp_weighted_vector_sum( ...@@ -150,4 +150,4 @@ void ff_acelp_weighted_vector_sum(
int shift, int shift,
int length); int length);
#endif /* FFMPEG_ACELP_VECTORS_H */ #endif /* AVCODEC_ACELP_VECTORS_H */
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
* adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/ * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/
*/ */
#ifndef FFMPEG_ADX_H #ifndef AVCODEC_ADX_H
#define FFMPEG_ADX_H #define AVCODEC_ADX_H
typedef struct { typedef struct {
int s1,s2; int s1,s2;
...@@ -46,4 +46,4 @@ typedef struct { ...@@ -46,4 +46,4 @@ typedef struct {
#define SCALE1 0x7298 #define SCALE1 0x7298
#define SCALE2 0x3350 #define SCALE2 0x3350
#endif /* FFMPEG_ADX_H */ #endif /* AVCODEC_ADX_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ASM_H #ifndef AVCODEC_ALPHA_ASM_H
#define FFMPEG_ASM_H #define AVCODEC_ALPHA_ASM_H
#include <inttypes.h> #include <inttypes.h>
...@@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed)); ...@@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
#error "Unknown compiler!" #error "Unknown compiler!"
#endif #endif
#endif /* FFMPEG_ASM_H */ #endif /* AVCODEC_ALPHA_ASM_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
*/ */
/* Some BSDs don't seem to have regdef.h... sigh */ /* Some BSDs don't seem to have regdef.h... sigh */
#ifndef FFMPEG_REGDEF_H #ifndef AVCODEC_ALPHA_REGDEF_H
#define FFMPEG_REGDEF_H #define AVCODEC_ALPHA_REGDEF_H
#define v0 $0 /* function return value */ #define v0 $0 /* function return value */
...@@ -63,4 +63,4 @@ ...@@ -63,4 +63,4 @@
#define sp $30 /* stack pointer */ #define sp $30 /* stack pointer */
#define zero $31 /* reads as zero, writes are noops */ #define zero $31 /* reads as zero, writes are noops */
#endif /* FFMPEG_REGDEF_H */ #endif /* AVCODEC_ALPHA_REGDEF_H */
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_ARMV4L_MATHOPS_H #ifndef AVCODEC_ARMV4L_MATHOPS_H
#define FFMPEG_ARMV4L_MATHOPS_H #define AVCODEC_ARMV4L_MATHOPS_H
#ifdef FRAC_BITS #ifdef FRAC_BITS
# define MULL(a, b) \ # define MULL(a, b) \
...@@ -80,4 +80,4 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b) ...@@ -80,4 +80,4 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b)
#endif #endif
#endif /* FFMPEG_ARMV4L_MATHOPS_H */ #endif /* AVCODEC_ARMV4L_MATHOPS_H */
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
* Atrac 3 AKA RealAudio 8 compatible decoder data * Atrac 3 AKA RealAudio 8 compatible decoder data
*/ */
#ifndef FFMPEG_ATRAC3DATA_H #ifndef AVCODEC_ATRAC3DATA_H
#define FFMPEG_ATRAC3DATA_H #define AVCODEC_ATRAC3DATA_H
#include <stdint.h> #include <stdint.h>
...@@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = { ...@@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = {
/* joint stereo related tables */ /* joint stereo related tables */
static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0}; static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};
#endif /* FFMPEG_ATRAC3DATA_H */ #endif /* AVCODEC_ATRAC3DATA_H */
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef FFMPEG_AUDIOCONVERT_H #ifndef AVCODEC_AUDIOCONVERT_H
#define FFMPEG_AUDIOCONVERT_H #define AVCODEC_AUDIOCONVERT_H
/** /**
* @file audioconvert.h * @file audioconvert.h
...@@ -88,4 +88,4 @@ int av_audio_convert(AVAudioConvert *ctx, ...@@ -88,4 +88,4 @@ int av_audio_convert(AVAudioConvert *ctx,
void * const out[6], const int out_stride[6], void * const out[6], const int out_stride[6],
const void * const in[6], const int in_stride[6], int len); const void * const in[6], const int in_stride[6], int len);
#endif /* FFMPEG_AUDIOCONVERT_H */ #endif /* AVCODEC_AUDIOCONVERT_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment