diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-31 07:39:47 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-08-31 07:39:47 +0000 |
| commit | 987903826b0dba2e134be200ac94be66b4a3acf1 (patch) | |
| tree | 3be692b87242d02bddeb5dbf4bac0621ff11c156 /libavcodec | |
| parent | f0319383436e1abc3fc1464fe4e5f4dc40db3419 (diff) | |
| download | ffmpeg-987903826b0dba2e134be200ac94be66b4a3acf1.tar.gz | |
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
Diffstat (limited to 'libavcodec')
167 files changed, 500 insertions, 500 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 83171e2c29..0a9cc81604 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -27,8 +27,8 @@ * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) */ -#ifndef FFMPEG_AAC_H -#define FFMPEG_AAC_H +#ifndef AVCODEC_AAC_H +#define AVCODEC_AAC_H #include "avcodec.h" #include "dsputil.h" @@ -272,4 +272,4 @@ typedef struct { } AACContext; -#endif /* FFMPEG_AAC_H */ +#endif /* AVCODEC_AAC_H */ diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index 36ea0e0671..b2fc0afde8 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AAC_AC3_PARSER_H -#define FFMPEG_AAC_AC3_PARSER_H +#ifndef AVCODEC_AAC_AC3_PARSER_H +#define AVCODEC_AAC_AC3_PARSER_H #include <stdint.h> #include "avcodec.h" @@ -50,4 +50,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_AAC_AC3_PARSER_H */ +#endif /* AVCODEC_AAC_AC3_PARSER_H */ diff --git a/libavcodec/aacdectab.h b/libavcodec/aacdectab.h index 3c27c384a8..e4b87d79a0 100644 --- a/libavcodec/aacdectab.h +++ b/libavcodec/aacdectab.h @@ -27,8 +27,8 @@ * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) */ -#ifndef FFMPEG_AACDECTAB_H -#define FFMPEG_AACDECTAB_H +#ifndef AVCODEC_AACDECTAB_H +#define AVCODEC_AACDECTAB_H #include "aac.h" @@ -206,4 +206,4 @@ static const float *tns_tmp2_map[4] = { }; // @} -#endif /* FFMPEG_AACDECTAB_H */ +#endif /* AVCODEC_AACDECTAB_H */ diff --git a/libavcodec/aacpsy.h b/libavcodec/aacpsy.h index d0dbb078e9..f0142677ee 100644 --- a/libavcodec/aacpsy.h +++ b/libavcodec/aacpsy.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AACPSY_H -#define FFMPEG_AACPSY_H +#ifndef AVCODEC_AACPSY_H +#define AVCODEC_AACPSY_H #include "avcodec.h" #include "aac.h" @@ -47,4 +47,4 @@ typedef struct AACPsyContext { */ void ff_aac_psy_end(AACPsyContext *ctx); -#endif /* FFMPEG_AACPSY_H */ +#endif /* AVCODEC_AACPSY_H */ diff --git a/libavcodec/aactab.h b/libavcodec/aactab.h index 1a3a8dfe2f..5189fcdde0 100644 --- a/libavcodec/aactab.h +++ b/libavcodec/aactab.h @@ -27,8 +27,8 @@ * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) */ -#ifndef FFMPEG_AACTAB_H -#define FFMPEG_AACTAB_H +#ifndef AVCODEC_AACTAB_H +#define AVCODEC_AACTAB_H #include "libavutil/mem.h" #include "aac.h" @@ -69,4 +69,4 @@ extern const float ff_aac_pow2sf_tab[316]; extern float ff_aac_pow2sf_tab[316]; #endif /* CONFIG_HARDCODED_TABLES */ -#endif /* FFMPEG_AACTAB_H */ +#endif /* AVCODEC_AACTAB_H */ diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 3b18a15a7c..1f5a7115d7 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -24,8 +24,8 @@ * Common code between the AC-3 encoder and decoder. */ -#ifndef FFMPEG_AC3_H -#define FFMPEG_AC3_H +#ifndef AVCODEC_AC3_H +#define AVCODEC_AC3_H #include "ac3tab.h" @@ -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_values); -#endif /* FFMPEG_AC3_H */ +#endif /* AVCODEC_AC3_H */ diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h index e49492558a..fc17e8773e 100644 --- a/libavcodec/ac3_parser.h +++ b/libavcodec/ac3_parser.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AC3_PARSER_H -#define FFMPEG_AC3_PARSER_H +#ifndef AVCODEC_AC3_PARSER_H +#define AVCODEC_AC3_PARSER_H #include "ac3.h" #include "bitstream.h" @@ -58,4 +58,4 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); */ int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr); -#endif /* FFMPEG_AC3_PARSER_H */ +#endif /* AVCODEC_AC3_PARSER_H */ diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 81825bd2bd..617080910b 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -24,8 +24,8 @@ * Common code between the AC-3 and E-AC-3 decoders. */ -#ifndef FFMPEG_AC3DEC_H -#define FFMPEG_AC3DEC_H +#ifndef AVCODEC_AC3DEC_H +#define AVCODEC_AC3DEC_H #include "libavutil/lfg.h" #include "ac3.h" @@ -179,4 +179,4 @@ int ff_eac3_parse_header(AC3DecodeContext *s); */ void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch); -#endif /* FFMPEG_AC3DEC_H */ +#endif /* AVCODEC_AC3DEC_H */ diff --git a/libavcodec/ac3dec_data.h b/libavcodec/ac3dec_data.h index ab2c430c31..0be680808c 100644 --- a/libavcodec/ac3dec_data.h +++ b/libavcodec/ac3dec_data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AC3DEC_DATA_H -#define FFMPEG_AC3DEC_DATA_H +#ifndef AVCODEC_AC3DEC_DATA_H +#define AVCODEC_AC3DEC_DATA_H #include "libavutil/common.h" @@ -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]; -#endif /* FFMPEG_AC3DEC_DATA_H */ +#endif /* AVCODEC_AC3DEC_DATA_H */ diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index 7b965d8497..a46e29d3c5 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AC3TAB_H -#define FFMPEG_AC3TAB_H +#ifndef AVCODEC_AC3TAB_H +#define AVCODEC_AC3TAB_H #include "libavutil/common.h" @@ -56,4 +56,4 @@ enum CustomChannelMapLocation{ AC3_CHMAP_LFE = 1<<(15-15) }; -#endif /* FFMPEG_AC3TAB_H */ +#endif /* AVCODEC_AC3TAB_H */ diff --git a/libavcodec/acelp_filters.h b/libavcodec/acelp_filters.h index 6b0679ff70..b2f05bc9f0 100644 --- a/libavcodec/acelp_filters.h +++ b/libavcodec/acelp_filters.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ACELP_FILTERS_H -#define FFMPEG_ACELP_FILTERS_H +#ifndef AVCODEC_ACELP_FILTERS_H +#define AVCODEC_ACELP_FILTERS_H #include <stdint.h> @@ -134,4 +134,4 @@ void ff_acelp_high_pass_filter( const int16_t* in, int length); -#endif /* FFMPEG_ACELP_FILTERS_H */ +#endif /* AVCODEC_ACELP_FILTERS_H */ diff --git a/libavcodec/acelp_math.h b/libavcodec/acelp_math.h index 769fcf6b1b..3843e69138 100644 --- a/libavcodec/acelp_math.h +++ b/libavcodec/acelp_math.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ACELP_MATH_H -#define FFMPEG_ACELP_MATH_H +#ifndef AVCODEC_ACELP_MATH_H +#define AVCODEC_ACELP_MATH_H #include <stdint.h> @@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset) else return value << offset; } -#endif /* FFMPEG_ACELP_MATH_H */ +#endif /* AVCODEC_ACELP_MATH_H */ diff --git a/libavcodec/acelp_pitch_delay.h b/libavcodec/acelp_pitch_delay.h index b5b9add7f2..be5ac09432 100644 --- a/libavcodec/acelp_pitch_delay.h +++ b/libavcodec/acelp_pitch_delay.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ACELP_PITCH_DELAY_H -#define FFMPEG_ACELP_PITCH_DELAY_H +#ifndef AVCODEC_ACELP_PITCH_DELAY_H +#define AVCODEC_ACELP_PITCH_DELAY_H #include <stdint.h> @@ -217,4 +217,4 @@ int16_t ff_acelp_decode_gain_code( int subframe_size, int max_pred_order); -#endif /* FFMPEG_ACELP_PITCH_DELAY_H */ +#endif /* AVCODEC_ACELP_PITCH_DELAY_H */ diff --git a/libavcodec/acelp_vectors.h b/libavcodec/acelp_vectors.h index ae6c0b23c3..a5e71fc128 100644 --- a/libavcodec/acelp_vectors.h +++ b/libavcodec/acelp_vectors.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ACELP_VECTORS_H -#define FFMPEG_ACELP_VECTORS_H +#ifndef AVCODEC_ACELP_VECTORS_H +#define AVCODEC_ACELP_VECTORS_H #include <stdint.h> @@ -150,4 +150,4 @@ void ff_acelp_weighted_vector_sum( int shift, int length); -#endif /* FFMPEG_ACELP_VECTORS_H */ +#endif /* AVCODEC_ACELP_VECTORS_H */ diff --git a/libavcodec/adx.h b/libavcodec/adx.h index 16180372ac..1df0611774 100644 --- a/libavcodec/adx.h +++ b/libavcodec/adx.h @@ -28,8 +28,8 @@ * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/ */ -#ifndef FFMPEG_ADX_H -#define FFMPEG_ADX_H +#ifndef AVCODEC_ADX_H +#define AVCODEC_ADX_H typedef struct { int s1,s2; @@ -46,4 +46,4 @@ typedef struct { #define SCALE1 0x7298 #define SCALE2 0x3350 -#endif /* FFMPEG_ADX_H */ +#endif /* AVCODEC_ADX_H */ diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h index 1d0fa6f6a7..6fef165de4 100644 --- a/libavcodec/alpha/asm.h +++ b/libavcodec/alpha/asm.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ASM_H -#define FFMPEG_ASM_H +#ifndef AVCODEC_ALPHA_ASM_H +#define AVCODEC_ALPHA_ASM_H #include <inttypes.h> @@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed)); #error "Unknown compiler!" #endif -#endif /* FFMPEG_ASM_H */ +#endif /* AVCODEC_ALPHA_ASM_H */ diff --git a/libavcodec/alpha/regdef.h b/libavcodec/alpha/regdef.h index aaa15e9945..aa1959f46e 100644 --- a/libavcodec/alpha/regdef.h +++ b/libavcodec/alpha/regdef.h @@ -20,8 +20,8 @@ */ /* Some BSDs don't seem to have regdef.h... sigh */ -#ifndef FFMPEG_REGDEF_H -#define FFMPEG_REGDEF_H +#ifndef AVCODEC_ALPHA_REGDEF_H +#define AVCODEC_ALPHA_REGDEF_H #define v0 $0 /* function return value */ @@ -63,4 +63,4 @@ #define sp $30 /* stack pointer */ #define zero $31 /* reads as zero, writes are noops */ -#endif /* FFMPEG_REGDEF_H */ +#endif /* AVCODEC_ALPHA_REGDEF_H */ diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h index ff12aef8c9..9602cd4f9f 100644 --- a/libavcodec/armv4l/mathops.h +++ b/libavcodec/armv4l/mathops.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ARMV4L_MATHOPS_H -#define FFMPEG_ARMV4L_MATHOPS_H +#ifndef AVCODEC_ARMV4L_MATHOPS_H +#define AVCODEC_ARMV4L_MATHOPS_H #ifdef FRAC_BITS # define MULL(a, b) \ @@ -80,4 +80,4 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b) #endif -#endif /* FFMPEG_ARMV4L_MATHOPS_H */ +#endif /* AVCODEC_ARMV4L_MATHOPS_H */ diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h index 555a3a20d6..ff9ada8753 100644 --- a/libavcodec/atrac3data.h +++ b/libavcodec/atrac3data.h @@ -25,8 +25,8 @@ * Atrac 3 AKA RealAudio 8 compatible decoder data */ -#ifndef FFMPEG_ATRAC3DATA_H -#define FFMPEG_ATRAC3DATA_H +#ifndef AVCODEC_ATRAC3DATA_H +#define AVCODEC_ATRAC3DATA_H #include <stdint.h> @@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = { /* 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}; -#endif /* FFMPEG_ATRAC3DATA_H */ +#endif /* AVCODEC_ATRAC3DATA_H */ diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h index e10849bd3a..c391759ebe 100644 --- a/libavcodec/audioconvert.h +++ b/libavcodec/audioconvert.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AUDIOCONVERT_H -#define FFMPEG_AUDIOCONVERT_H +#ifndef AVCODEC_AUDIOCONVERT_H +#define AVCODEC_AUDIOCONVERT_H /** * @file audioconvert.h @@ -88,4 +88,4 @@ int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], const int in_stride[6], int len); -#endif /* FFMPEG_AUDIOCONVERT_H */ +#endif /* AVCODEC_AUDIOCONVERT_H */ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 63c62d8b05..e333841fd0 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_AVCODEC_H -#define FFMPEG_AVCODEC_H +#ifndef AVCODEC_AVCODEC_H +#define AVCODEC_AVCODEC_H /** * @file avcodec.h @@ -3074,4 +3074,4 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample); #define AVERROR_NOENT AVERROR(ENOENT) /**< No such file or directory. */ #define AVERROR_PATCHWELCOME -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */ -#endif /* FFMPEG_AVCODEC_H */ +#endif /* AVCODEC_AVCODEC_H */ diff --git a/libavcodec/bethsoftvideo.h b/libavcodec/bethsoftvideo.h index 96629cd054..d5b5d0a525 100644 --- a/libavcodec/bethsoftvideo.h +++ b/libavcodec/bethsoftvideo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_BETHSOFTVIDEO_H -#define FFMPEG_BETHSOFTVIDEO_H +#ifndef AVCODEC_BETHSOFTVIDEO_H +#define AVCODEC_BETHSOFTVIDEO_H enum BethsoftVidBlockType { @@ -33,4 +33,4 @@ enum BethsoftVidBlockType EOF_BLOCK = 0x14, }; -#endif /* FFMPEG_BETHSOFTVIDEO_H */ +#endif /* AVCODEC_BETHSOFTVIDEO_H */ diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h index 0f0eab6bef..bc488f8025 100644 --- a/libavcodec/bfin/config_bfin.h +++ b/libavcodec/bfin/config_bfin.h @@ -30,8 +30,8 @@ DEFUN(put_pixels_clamped,mL1, rts; */ -#ifndef FFMPEG_CONFIG_BFIN_H -#define FFMPEG_CONFIG_BFIN_H +#ifndef AVCODEC_BFIN_CONFIG_BFIN_H +#define AVCODEC_BFIN_CONFIG_BFIN_H #ifndef DEFUN @@ -62,4 +62,4 @@ DEFUN(put_pixels_clamped,mL1, #endif -#endif /* FFMPEG_CONFIG_BFIN_H */ +#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */ diff --git a/libavcodec/bfin/dsputil_bfin.h b/libavcodec/bfin/dsputil_bfin.h index 411c8ea73c..8d5d32746d 100644 --- a/libavcodec/bfin/dsputil_bfin.h +++ b/libavcodec/bfin/dsputil_bfin.h @@ -21,8 +21,8 @@ */ -#ifndef FFMPEG_DSPUTIL_BFIN_H -#define FFMPEG_DSPUTIL_BFIN_H +#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H +#define AVCODEC_BFIN_DSPUTIL_BFIN_H #ifdef __FDPIC__ #define attribute_l1_text __attribute__ ((l1_text)) @@ -71,4 +71,4 @@ static void bfprof (void) #define bfprof() #endif -#endif /* FFMPEG_DSPUTIL_BFIN_H */ +#endif /* AVCODEC_BFIN_DSPUTIL_BFIN_H */ diff --git a/libavcodec/bfin/mathops.h b/libavcodec/bfin/mathops.h index ec40f4e681..7bdffbc9b1 100644 --- a/libavcodec/bfin/mathops.h +++ b/libavcodec/bfin/mathops.h @@ -19,8 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_BFIN_MATHOPS_H -#define FFMPEG_BFIN_MATHOPS_H +#ifndef AVCODEC_BFIN_MATHOPS_H +#define AVCODEC_BFIN_MATHOPS_H #ifdef CONFIG_MPEGAUDIO_HP #define MULH(X,Y) ({ int xxo; \ @@ -49,4 +49,4 @@ : "=W" (xxo) : "d" (a), "d" (b) : "A1"); \ xxo; }) -#endif /* FFMPEG_BFIN_MATHOPS_H */ +#endif /* AVCODEC_BFIN_MATHOPS_H */ diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 14e54e40ff..770c1ddd36 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -23,8 +23,8 @@ * bitstream api header. */ -#ifndef FFMPEG_BITSTREAM_H -#define FFMPEG_BITSTREAM_H +#ifndef AVCODEC_BITSTREAM_H +#define AVCODEC_BITSTREAM_H #include <stdint.h> #include <stdlib.h> @@ -954,4 +954,4 @@ static inline int decode210(GetBitContext *gb){ return 2 - get_bits1(gb); } -#endif /* FFMPEG_BITSTREAM_H */ +#endif /* AVCODEC_BITSTREAM_H */ diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h index cbbd21ce90..b24a1faf00 100644 --- a/libavcodec/bmp.h +++ b/libavcodec/bmp.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_BMP_H -#define FFMPEG_BMP_H +#ifndef AVCODEC_BMP_H +#define AVCODEC_BMP_H #include "avcodec.h" @@ -35,4 +35,4 @@ typedef enum { BMP_BITFIELDS =3, } BiCompression; -#endif /* FFMPEG_BMP_H */ +#endif /* AVCODEC_BMP_H */ diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index 61fb36a76d..e0d7111d17 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_BYTESTREAM_H -#define FFMPEG_BYTESTREAM_H +#ifndef AVCODEC_BYTESTREAM_H +#define AVCODEC_BYTESTREAM_H #include "libavutil/common.h" @@ -66,4 +66,4 @@ static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *s (*b) += size; } -#endif /* FFMPEG_BYTESTREAM_H */ +#endif /* AVCODEC_BYTESTREAM_H */ diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h index b748237ad3..bfab32dae5 100644 --- a/libavcodec/cabac.h +++ b/libavcodec/cabac.h @@ -24,8 +24,8 @@ * Context Adaptive Binary Arithmetic Coder. */ -#ifndef FFMPEG_CABAC_H -#define FFMPEG_CABAC_H +#ifndef AVCODEC_CABAC_H +#define AVCODEC_CABAC_H #include "bitstream.h" @@ -757,4 +757,4 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe } #endif /* 0 */ -#endif /* FFMPEG_CABAC_H */ +#endif /* AVCODEC_CABAC_H */ diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h index 9afa96e42c..c684acf799 100644 --- a/libavcodec/cavs.h +++ b/libavcodec/cavs.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_CAVS_H -#define FFMPEG_CAVS_H +#ifndef AVCODEC_CAVS_H +#define AVCODEC_CAVS_H #include "dsputil.h" #include "mpegvideo.h" @@ -311,4 +311,4 @@ void ff_cavs_init_top_lines(AVSContext *h); int ff_cavs_init(AVCodecContext *avctx); int ff_cavs_end (AVCodecContext *avctx); -#endif /* FFMPEG_CAVS_H */ +#endif /* AVCODEC_CAVS_H */ diff --git a/libavcodec/cavsdata.h b/libavcodec/cavsdata.h index a24fb5ddb4..94b620b366 100644 --- a/libavcodec/cavsdata.h +++ b/libavcodec/cavsdata.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_CAVSDATA_H -#define FFMPEG_CAVSDATA_H +#ifndef AVCODEC_CAVSDATA_H +#define AVCODEC_CAVSDATA_H #include "cavs.h" @@ -502,4 +502,4 @@ const int_fast8_t ff_top_modifier_l[8] = {-1, 1, 5,-1,-1, 5, 7, 7}; const int_fast8_t ff_left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6}; const int_fast8_t ff_top_modifier_c[7] = { 4, 1,-1,-1, 4, 6, 6}; -#endif /* FFMPEG_CAVSDATA_H */ +#endif /* AVCODEC_CAVSDATA_H */ diff --git a/libavcodec/colorspace.h b/libavcodec/colorspace.h index 9d89d6daa4..7221517527 100644 --- a/libavcodec/colorspace.h +++ b/libavcodec/colorspace.h @@ -24,8 +24,8 @@ * Various defines for YUV<->RGB conversion */ -#ifndef FFMPEG_COLORSPACE_H -#define FFMPEG_COLORSPACE_H +#ifndef AVCODEC_COLORSPACE_H +#define AVCODEC_COLORSPACE_H #define SCALEBITS 10 #define ONE_HALF (1 << (SCALEBITS - 1)) @@ -108,4 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) { (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) -#endif /* FFMPEG_COLORSPACE_H */ +#endif /* AVCODEC_COLORSPACE_H */ diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h index c86577c6b7..4aa1a4ad3a 100644 --- a/libavcodec/cookdata.h +++ b/libavcodec/cookdata.h @@ -25,8 +25,8 @@ * Cook AKA RealAudio G2 compatible decoderdata */ -#ifndef FFMPEG_COOKDATA_H -#define FFMPEG_COOKDATA_H +#ifndef AVCODEC_COOKDATA_H +#define AVCODEC_COOKDATA_H #include <stdint.h> @@ -560,4 +560,4 @@ static const float* const cplscales[5] = { cplscale2, cplscale3, cplscale4, cplscale5, cplscale6, }; -#endif /* FFMPEG_COOKDATA_H */ +#endif /* AVCODEC_COOKDATA_H */ diff --git a/libavcodec/dca.h b/libavcodec/dca.h index e2197a4408..389571909e 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -22,8 +22,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DCA_H -#define FFMPEG_DCA_H +#ifndef AVCODEC_DCA_H +#define AVCODEC_DCA_H /** DCA syncwords, also used for bitstream type detection */ #define DCA_MARKER_RAW_BE 0x7FFE8001 @@ -31,4 +31,4 @@ #define DCA_MARKER_14B_BE 0x1FFFE800 #define DCA_MARKER_14B_LE 0xFF1F00E8 -#endif /* FFMPEG_DCA_H */ +#endif /* AVCODEC_DCA_H */ diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 696efe28a0..8b777efda1 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -24,8 +24,8 @@ * @file dcadata.c */ -#ifndef FFMPEG_DCADATA_H -#define FFMPEG_DCADATA_H +#ifndef AVCODEC_DCADATA_H +#define AVCODEC_DCADATA_H #include <stdint.h> @@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel. */ -#endif /* FFMPEG_DCADATA_H */ +#endif /* AVCODEC_DCADATA_H */ diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h index bdb05d55d0..5704ac383a 100644 --- a/libavcodec/dcahuff.h +++ b/libavcodec/dcahuff.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DCAHUFF_H -#define FFMPEG_DCAHUFF_H +#ifndef AVCODEC_DCAHUFF_H +#define AVCODEC_DCAHUFF_H #include <stdint.h> #include <stdlib.h> @@ -1073,4 +1073,4 @@ static const uint8_t* const bitalloc_bits[10][8] = { bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL } }; -#endif /* FFMPEG_DCAHUFF_H */ +#endif /* AVCODEC_DCAHUFF_H */ diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 1bd028e085..8dbc48ba0f 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DNXHDDATA_H -#define FFMPEG_DNXHDDATA_H +#ifndef AVCODEC_DNXHDDATA_H +#define AVCODEC_DNXHDDATA_H #include <stdint.h> #include "avcodec.h" @@ -48,4 +48,4 @@ extern const CIDEntry ff_dnxhd_cid_table[]; int ff_dnxhd_get_cid_table(int cid); int ff_dnxhd_find_cid(AVCodecContext *avctx); -#endif /* FFMPEG_DNXHDDATA_H */ +#endif /* AVCODEC_DNXHDDATA_H */ diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4b7e8ed4a4..b8504bc0ac 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -27,8 +27,8 @@ * absolutely necessary to call emms_c() between dsp & float/double code */ -#ifndef FFMPEG_DSPUTIL_H -#define FFMPEG_DSPUTIL_H +#ifndef AVCODEC_DSPUTIL_H +#define AVCODEC_DSPUTIL_H #include "avcodec.h" @@ -824,4 +824,4 @@ static inline void copy_block17(uint8_t *dst, uint8_t *src, int dstStride, int s } } -#endif /* FFMPEG_DSPUTIL_H */ +#endif /* AVCODEC_DSPUTIL_H */ diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index 5f8e73c26d..6197b285a6 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -24,8 +24,8 @@ * Constants for DV codec. */ -#ifndef FFMPEG_DVDATA_H -#define FFMPEG_DVDATA_H +#ifndef AVCODEC_DVDATA_H +#define AVCODEC_DVDATA_H #include "libavutil/rational.h" #include "avcodec.h" @@ -6443,4 +6443,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf) return 3; } -#endif /* FFMPEG_DVDATA_H */ +#endif /* AVCODEC_DVDATA_H */ diff --git a/libavcodec/elbg.h b/libavcodec/elbg.h index 84ec8657ef..9be0440e86 100644 --- a/libavcodec/elbg.h +++ b/libavcodec/elbg.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ELBG_H -#define FFMPEG_ELBG_H +#ifndef AVCODEC_ELBG_H +#define AVCODEC_ELBG_H #include "libavutil/random.h" @@ -52,4 +52,4 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook, int numCB, int num_steps, int *closest_cb, AVRandomState *rand_state); -#endif /* FFMPEG_ELBG_H */ +#endif /* AVCODEC_ELBG_H */ diff --git a/libavcodec/eval.h b/libavcodec/eval.h index 786e950c01..2083a6307c 100644 --- a/libavcodec/eval.h +++ b/libavcodec/eval.h @@ -25,8 +25,8 @@ * eval header. */ -#ifndef FFMPEG_EVAL_H -#define FFMPEG_EVAL_H +#ifndef AVCODEC_EVAL_H +#define AVCODEC_EVAL_H #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) /** @@ -84,4 +84,4 @@ AVEvalExpr * ff_parse(const char *s, const char **const_name, double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque); void ff_eval_free(AVEvalExpr * e); -#endif /* FFMPEG_EVAL_H */ +#endif /* AVCODEC_EVAL_H */ diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h index b9a4eeb3e5..b86f9accb4 100644 --- a/libavcodec/faandct.h +++ b/libavcodec/faandct.h @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_FAANDCT_H -#define FFMPEG_FAANDCT_H +#ifndef AVCODEC_FAANDCT_H +#define AVCODEC_FAANDCT_H #include "dsputil.h" @@ -36,4 +36,4 @@ void ff_faandct(DCTELEM * data); void ff_faandct248(DCTELEM * data); -#endif /* FFMPEG_FAANDCT_H */ +#endif /* AVCODEC_FAANDCT_H */ diff --git a/libavcodec/faanidct.h b/libavcodec/faanidct.h index 817ca31214..4cf1189286 100644 --- a/libavcodec/faanidct.h +++ b/libavcodec/faanidct.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_FAANIDCT_H -#define FFMPEG_FAANIDCT_H +#ifndef AVCODEC_FAANIDCT_H +#define AVCODEC_FAANIDCT_H #include <stdint.h> #include "dsputil.h" @@ -29,4 +29,4 @@ void ff_faanidct(DCTELEM block[64]); void ff_faanidct_add(uint8_t *dest, int line_size, DCTELEM block[64]); void ff_faanidct_put(uint8_t *dest, int line_size, DCTELEM block[64]); -#endif /* FFMPEG_FAANIDCT_H */ +#endif /* AVCODEC_FAANIDCT_H */ diff --git a/libavcodec/flac.h b/libavcodec/flac.h index d9da14927c..e110f48cec 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -24,8 +24,8 @@ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions */ -#ifndef FFMPEG_FLAC_H -#define FFMPEG_FLAC_H +#ifndef AVCODEC_FLAC_H +#define AVCODEC_FLAC_H #include "avcodec.h" @@ -54,4 +54,4 @@ typedef struct FLACStreaminfo { void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); -#endif /* FFMPEG_FLAC_H */ +#endif /* AVCODEC_FLAC_H */ diff --git a/libavcodec/g729.h b/libavcodec/g729.h index 8e6378367a..3fdf1ee650 100644 --- a/libavcodec/g729.h +++ b/libavcodec/g729.h @@ -18,12 +18,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_G729_H -#define FFMPEG_G729_H +#ifndef AVCODEC_G729_H +#define AVCODEC_G729_H /** * maximum possible subframe size */ #define MAX_SUBFRAME_SIZE 44 -#endif // FFMPEG_G729_H +#endif // AVCODEC_G729_H diff --git a/libavcodec/g729data.h b/libavcodec/g729data.h index 6c73952631..0caf25cacc 100644 --- a/libavcodec/g729data.h +++ b/libavcodec/g729data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_G729DATA_H -#define FFMPEG_G729DATA_H +#ifndef AVCODEC_G729DATA_H +#define AVCODEC_G729DATA_H #include <stdint.h> @@ -211,4 +211,4 @@ static const int16_t cb_lsp_2nd[1<<VQ_2ND_BITS][10] = { -163, 674, -11, -886, 531, -1125, -265, -242, 724, 934} }; -#endif // FFMPEG_G729DATA_H +#endif // AVCODEC_G729DATA_H diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index db4586521c..a1d904cced 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -27,8 +27,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi */ -#ifndef FFMPEG_GOLOMB_H -#define FFMPEG_GOLOMB_H +#ifndef AVCODEC_GOLOMB_H +#define AVCODEC_GOLOMB_H #include <stdint.h> #include "bitstream.h" @@ -504,4 +504,4 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit set_ur_golomb_jpegls(pb, v, k, limit, esc_len); } -#endif /* FFMPEG_GOLOMB_H */ +#endif /* AVCODEC_GOLOMB_H */ diff --git a/libavcodec/h261.h b/libavcodec/h261.h index f0ce7c366a..b5eb539e73 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -25,8 +25,8 @@ * h261codec. */ -#ifndef FFMPEG_H261_H -#define FFMPEG_H261_H +#ifndef AVCODEC_H261_H +#define AVCODEC_H261_H #include "mpegvideo.h" @@ -48,4 +48,4 @@ typedef struct H261Context{ #define MB_TYPE_H261_FIL 0x800000 -#endif /* FFMPEG_H261_H */ +#endif /* AVCODEC_H261_H */ diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h index a86b6df98a..9218bf1c03 100644 --- a/libavcodec/h261data.h +++ b/libavcodec/h261data.h @@ -24,8 +24,8 @@ * H.261 tables. */ -#ifndef FFMPEG_H261DATA_H -#define FFMPEG_H261DATA_H +#ifndef AVCODEC_H261DATA_H +#define AVCODEC_H261DATA_H #include <stdint.h> #include "h261.h" @@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = { h261_tcoeff_level, }; -#endif /* FFMPEG_H261DATA_H */ +#endif /* AVCODEC_H261DATA_H */ diff --git a/libavcodec/h263.h b/libavcodec/h263.h index 47b168b54a..2df3be5ab0 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_H263_H -#define FFMPEG_H263_H +#ifndef AVCODEC_H263_H +#define AVCODEC_H263_H #include "config.h" #include "msmpeg4.h" @@ -43,4 +43,4 @@ ENABLE_WMV_ENCODER) #define ENABLE_ANY_H263 (ENABLE_ANY_H263_DECODER || ENABLE_ANY_H263_ENCODER) -#endif /* FFMPEG_H263_H */ +#endif /* AVCODEC_H263_H */ diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h index dc50774517..565a222bc1 100644 --- a/libavcodec/h263_parser.h +++ b/libavcodec/h263_parser.h @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_H263_PARSER_H -#define FFMPEG_H263_PARSER_H +#ifndef AVCODEC_H263_PARSER_H +#define AVCODEC_H263_PARSER_H #include "parser.h" int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_H263_PARSER_H */ +#endif /* AVCODEC_H263_PARSER_H */ diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index b6c1c163cc..089f4fbc9d 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -26,8 +26,8 @@ * H.263 tables. */ -#ifndef FFMPEG_H263DATA_H -#define FFMPEG_H263DATA_H +#ifndef AVCODEC_H263DATA_H +#define AVCODEC_H263DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -311,4 +311,4 @@ const uint8_t ff_h263_loop_filter_strength[32]={ 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12 }; -#endif /* FFMPEG_H263DATA_H */ +#endif /* AVCODEC_H263DATA_H */ diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 1f1cb1c5d6..9ca5beb6c3 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_H -#define FFMPEG_H264_H +#ifndef AVCODEC_H264_H +#define AVCODEC_H264_H #include "dsputil.h" #include "cabac.h" @@ -435,4 +435,4 @@ typedef struct H264Context{ }H264Context; -#endif /* FFMPEG_H264_H */ +#endif /* AVCODEC_H264_H */ diff --git a/libavcodec/h264_parser.h b/libavcodec/h264_parser.h index 0bb286ffea..f37b64f924 100644 --- a/libavcodec/h264_parser.h +++ b/libavcodec/h264_parser.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_PARSER_H -#define FFMPEG_H264_PARSER_H +#ifndef AVCODEC_H264_PARSER_H +#define AVCODEC_H264_PARSER_H #include "h264.h" @@ -36,4 +36,4 @@ */ int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_H264_PARSER_H */ +#endif /* AVCODEC_H264_PARSER_H */ diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 32cbcbf051..6ee8442829 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264DATA_H -#define FFMPEG_H264DATA_H +#ifndef AVCODEC_H264DATA_H +#define AVCODEC_H264DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -1316,4 +1316,4 @@ static const int8_t cabac_context_init_PB[3][460][2] = } }; -#endif /* FFMPEG_H264DATA_H */ +#endif /* AVCODEC_H264DATA_H */ diff --git a/libavcodec/h264pred.h b/libavcodec/h264pred.h index dae0d81cc2..150567d294 100644 --- a/libavcodec/h264pred.h +++ b/libavcodec/h264pred.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264PRED_H -#define FFMPEG_H264PRED_H +#ifndef AVCODEC_H264PRED_H +#define AVCODEC_H264PRED_H #include "libavutil/common.h" @@ -79,4 +79,4 @@ typedef struct H264PredContext{ void ff_h264_pred_init(H264PredContext *h, int codec_id); -#endif /* FFMPEG_H264PRED_H */ +#endif /* AVCODEC_H264PRED_H */ diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 650700be8c..0b11af8b45 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_HUFFMAN_H -#define FFMPEG_HUFFMAN_H +#ifndef AVCODEC_HUFFMAN_H +#define AVCODEC_HUFFMAN_H #include "avcodec.h" #include "bitstream.h" @@ -39,4 +39,4 @@ typedef int (*huff_cmp_t)(const void *va, const void *vb); int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, Node *nodes, huff_cmp_t cmp, int flags); -#endif /* FFMPEG_HUFFMAN_H */ +#endif /* AVCODEC_HUFFMAN_H */ diff --git a/libavcodec/i386/dsputil_mmx.h b/libavcodec/i386/dsputil_mmx.h index a4b3bfcdac..f095975128 100644 --- a/libavcodec/i386/dsputil_mmx.h +++ b/libavcodec/i386/dsputil_mmx.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_MMX_H -#define FFMPEG_DSPUTIL_MMX_H +#ifndef AVCODEC_I386_DSPUTIL_MMX_H +#define AVCODEC_I386_DSPUTIL_MMX_H #include <stdint.h> #include "libavcodec/dsputil.h" @@ -133,4 +133,4 @@ extern const double ff_pd_2[2]; void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); -#endif /* FFMPEG_DSPUTIL_MMX_H */ +#endif /* AVCODEC_I386_DSPUTIL_MMX_H */ diff --git a/libavcodec/i386/h264_i386.h b/libavcodec/i386/h264_i386.h index 80468f68c9..5cd03a519b 100644 --- a/libavcodec/i386/h264_i386.h +++ b/libavcodec/i386/h264_i386.h @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_I386_H -#define FFMPEG_H264_I386_H +#ifndef AVCODEC_I386_H264_I386_H +#define AVCODEC_I386_H264_I386_H #include "libavcodec/cabac.h" @@ -152,4 +152,4 @@ static int decode_significance_8x8_x86(CABACContext *c, #endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && */ /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ -#endif /* FFMPEG_H264_I386_H */ +#endif /* AVCODEC_I386_H264_I386_H */ diff --git a/libavcodec/i386/idct_xvid.h b/libavcodec/i386/idct_xvid.h index 8e62671e5e..2051ebd591 100644 --- a/libavcodec/i386/idct_xvid.h +++ b/libavcodec/i386/idct_xvid.h @@ -23,8 +23,8 @@ * header for Xvid IDCT functions */ -#ifndef FFMPEG_IDCT_XVID_H -#define FFMPEG_IDCT_XVID_H +#ifndef AVCODEC_I386_IDCT_XVID_H +#define AVCODEC_I386_IDCT_XVID_H void ff_idct_xvid_mmx(short *block); void ff_idct_xvid_mmx2(short *block); @@ -32,4 +32,4 @@ void ff_idct_xvid_sse2(short *block); void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block); void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block); -#endif /* FFMPEG_IDCT_XVID_H */ +#endif /* AVCODEC_I386_IDCT_XVID_H */ diff --git a/libavcodec/i386/mathops.h b/libavcodec/i386/mathops.h index 75ed55c57d..46c2d638f0 100644 --- a/libavcodec/i386/mathops.h +++ b/libavcodec/i386/mathops.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_I386_MATHOPS_H -#define FFMPEG_I386_MATHOPS_H +#ifndef AVCODEC_I386_MATHOPS_H +#define AVCODEC_I386_MATHOPS_H #ifdef FRAC_BITS # define MULL(ra, rb) \ @@ -42,4 +42,4 @@ asm ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\ rt; }) -#endif /* FFMPEG_I386_MATHOPS_H */ +#endif /* AVCODEC_I386_MATHOPS_H */ diff --git a/libavcodec/i386/mmx.h b/libavcodec/i386/mmx.h index 361c6b6371..197e059a1c 100644 --- a/libavcodec/i386/mmx.h +++ b/libavcodec/i386/mmx.h @@ -18,8 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MMX_H -#define FFMPEG_MMX_H +#ifndef AVCODEC_I386_MMX_H +#define AVCODEC_I386_MMX_H #warning Everything in this header is deprecated, use plain asm()! New code using this header will be rejected. @@ -282,4 +282,4 @@ typedef union { #define punpckhqdq_r2r(regs,regd) mmx_r2r (punpckhqdq, regs, regd) -#endif /* FFMPEG_MMX_H */ +#endif /* AVCODEC_I386_MMX_H */ diff --git a/libavcodec/i386/vp3dsp_mmx.h b/libavcodec/i386/vp3dsp_mmx.h index d0e61960ae..2c6fc4fa59 100644 --- a/libavcodec/i386/vp3dsp_mmx.h +++ b/libavcodec/i386/vp3dsp_mmx.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DSP_MMX_H -#define FFMPEG_VP3DSP_MMX_H +#ifndef AVCODEC_I386_VP3DSP_MMX_H +#define AVCODEC_I386_VP3DSP_MMX_H #include <stdint.h> #include "libavcodec/dsputil.h" @@ -29,4 +29,4 @@ void ff_vp3_idct_mmx(int16_t *data); void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_VP3DSP_MMX_H */ +#endif /* AVCODEC_I386_VP3DSP_MMX_H */ diff --git a/libavcodec/i386/vp3dsp_sse2.h b/libavcodec/i386/vp3dsp_sse2.h index a421abc9ae..55908c22a0 100644 --- a/libavcodec/i386/vp3dsp_sse2.h +++ b/libavcodec/i386/vp3dsp_sse2.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DSP_SSE2_H -#define FFMPEG_VP3DSP_SSE2_H +#ifndef AVCODEC_I386_VP3DSP_SSE2_H +#define AVCODEC_I386_VP3DSP_SSE2_H #include "libavcodec/dsputil.h" @@ -28,4 +28,4 @@ void ff_vp3_idct_sse2(int16_t *input_data); void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_VP3DSP_SSE2_H */ +#endif /* AVCODEC_I386_VP3DSP_SSE2_H */ diff --git a/libavcodec/iirfilter.h b/libavcodec/iirfilter.h index ac948d8959..d51f44b8e8 100644 --- a/libavcodec/iirfilter.h +++ b/libavcodec/iirfilter.h @@ -24,8 +24,8 @@ * IIR filter interface */ -#ifndef FFMPEG_IIRFILTER_H -#define FFMPEG_IIRFILTER_H +#ifndef AVCODEC_IIRFILTER_H +#define AVCODEC_IIRFILTER_H #include "avcodec.h" @@ -100,4 +100,4 @@ void ff_iir_filter_free_state(struct FFIIRFilterState *state); void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, int size, const int16_t *src, int sstep, int16_t *dst, int dstep); -#endif /* FFMPEG_IIRFILTER_H */ +#endif /* AVCODEC_IIRFILTER_H */ diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h index 966bc2789f..64e7c7185e 100644 --- a/libavcodec/imcdata.h +++ b/libavcodec/imcdata.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMCDATA_H -#define FFMPEG_IMCDATA_H +#ifndef AVCODEC_IMCDATA_H +#define AVCODEC_IMCDATA_H #include <stdint.h> @@ -166,4 +166,4 @@ static const uint16_t imc_huffman_bits[4][4][18] = { } }; -#endif /* FFMPEG_IMCDATA_H */ +#endif /* AVCODEC_IMCDATA_H */ diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h index a87106aee2..bfaa03ea16 100644 --- a/libavcodec/imgconvert.h +++ b/libavcodec/imgconvert.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMGCONVERT_H -#define FFMPEG_IMGCONVERT_H +#ifndef AVCODEC_IMGCONVERT_H +#define AVCODEC_IMGCONVERT_H #include <stdint.h> #include "avcodec.h" @@ -33,4 +33,4 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height); int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); -#endif /* FFMPEG_IMGCONVERT_H */ +#endif /* AVCODEC_IMGCONVERT_H */ diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h index 2be32dfc92..b2e0b8a509 100644 --- a/libavcodec/indeo2data.h +++ b/libavcodec/indeo2data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INDEO2DATA_H -#define FFMPEG_INDEO2DATA_H +#ifndef AVCODEC_INDEO2DATA_H +#define AVCODEC_INDEO2DATA_H #include <stdint.h> @@ -138,4 +138,4 @@ static const uint8_t ir2_luma_table[256] = { 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80 }; -#endif /* FFMPEG_INDEO2DATA_H */ +#endif /* AVCODEC_INDEO2DATA_H */ diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h index eb9a8c19e4..bbc4c952ff 100644 --- a/libavcodec/indeo3data.h +++ b/libavcodec/indeo3data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INDEO3DATA_H -#define FFMPEG_INDEO3DATA_H +#ifndef AVCODEC_INDEO3DATA_H +#define AVCODEC_INDEO3DATA_H #include <stdint.h> @@ -2339,4 +2339,4 @@ static const uint32_t correctionhighorder[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; -#endif /* FFMPEG_INDEO3DATA_H */ +#endif /* AVCODEC_INDEO3DATA_H */ diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 3f6de67da5..5f63e6abf3 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INTRAX8_H -#define FFMPEG_INTRAX8_H +#ifndef AVCODEC_INTRAX8_H +#define AVCODEC_INTRAX8_H #include "bitstream.h" #include "mpegvideo.h" @@ -54,4 +54,4 @@ void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s); void ff_intrax8_common_end(IntraX8Context * w); int ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq); -#endif /* FFMPEG_INTRAX8_H */ +#endif /* AVCODEC_INTRAX8_H */ diff --git a/libavcodec/intrax8huf.h b/libavcodec/intrax8huf.h index f8c830d954..375906bab2 100644 --- a/libavcodec/intrax8huf.h +++ b/libavcodec/intrax8huf.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INTRAX8HUF_H -#define FFMPEG_INTRAX8HUF_H +#ifndef AVCODEC_INTRAX8HUF_H +#define AVCODEC_INTRAX8HUF_H #include <inttypes.h> @@ -915,4 +915,4 @@ static const uint16_t x8_ac1_highquant_table[8][77][2]={ }; #define MAX_AC_VLC_BITS 16 -#endif /* FFMPEG_INTRAX8HUF_H */ +#endif /* AVCODEC_INTRAX8HUF_H */ diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index 792d2be3b5..c2b22e25e6 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -25,8 +25,8 @@ * JPEG-LS common code. */ -#ifndef FFMPEG_JPEGLS_H -#define FFMPEG_JPEGLS_H +#ifndef AVCODEC_JPEGLS_H +#define AVCODEC_JPEGLS_H #include "avcodec.h" @@ -108,4 +108,4 @@ static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err #define R(a, i ) (bits == 8 ? ((uint8_t*)(a))[i] : ((uint16_t*)(a))[i] ) #define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v)) -#endif /* FFMPEG_JPEGLS_H */ +#endif /* AVCODEC_JPEGLS_H */ diff --git a/libavcodec/jpeglsdec.h b/libavcodec/jpeglsdec.h index 362a0feb52..f9416dfa36 100644 --- a/libavcodec/jpeglsdec.h +++ b/libavcodec/jpeglsdec.h @@ -25,8 +25,8 @@ * JPEG-LS decoder. */ -#ifndef FFMPEG_JPEGLSDEC_H -#define FFMPEG_JPEGLSDEC_H +#ifndef AVCODEC_JPEGLSDEC_H +#define AVCODEC_JPEGLSDEC_H #include "mjpeg.h" #include "mjpegdec.h" @@ -38,4 +38,4 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s); int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv); -#endif /* FFMPEG_JPEGLSDEC_H */ +#endif /* AVCODEC_JPEGLSDEC_H */ diff --git a/libavcodec/lcl.h b/libavcodec/lcl.h index 7d5a76a789..b60c0e901a 100644 --- a/libavcodec/lcl.h +++ b/libavcodec/lcl.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LCL_H -#define FFMPEG_LCL_H +#ifndef AVCODEC_LCL_H +#define AVCODEC_LCL_H #define BMPTYPE_YUV 1 #define BMPTYPE_RGB 2 @@ -46,4 +46,4 @@ #define CODEC_MSZH 1 #define CODEC_ZLIB 3 -#endif /* FFMPEG_LCL_H */ +#endif /* AVCODEC_LCL_H */ diff --git a/libavcodec/libdirac.h b/libavcodec/libdirac.h index 31cd5738d7..54db287824 100644 --- a/libavcodec/libdirac.h +++ b/libavcodec/libdirac.h @@ -23,8 +23,8 @@ * data structures common to libdiracenc.c and libdiracdec.c */ -#ifndef FFMPEG_LIBDIRAC_H -#define FFMPEG_LIBDIRAC_H +#ifndef AVCODEC_LIBDIRAC_H +#define AVCODEC_LIBDIRAC_H #include "config.h" @@ -46,4 +46,4 @@ static const struct { }; #endif /* CONFIG_LIBDIRAC */ -#endif /* FFMPEG_LIBDIRAC_H */ +#endif /* AVCODEC_LIBDIRAC_H */ diff --git a/libavcodec/libdirac_libschro.h b/libavcodec/libdirac_libschro.h index 81a0fe4b3e..9c6c0f1024 100644 --- a/libavcodec/libdirac_libschro.h +++ b/libavcodec/libdirac_libschro.h @@ -23,8 +23,8 @@ * data structures common to libdirac and libschroedinger */ -#ifndef FFMPEG_LIBDIRAC_LIBSCHRO_H -#define FFMPEG_LIBDIRAC_LIBSCHRO_H +#ifndef AVCODEC_LIBDIRAC_LIBSCHRO_H +#define AVCODEC_LIBDIRAC_LIBSCHRO_H #include "avcodec.h" @@ -106,4 +106,4 @@ void *ff_dirac_schro_queue_pop (FfmpegDiracSchroQueue *queue); */ void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue, void (*free_func)(void *)); -#endif /* FFMPEG_LIBDIRAC_LIBSCHRO_H */ +#endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */ diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h index 7b5f7f2bcf..6902a5d059 100644 --- a/libavcodec/libschroedinger.h +++ b/libavcodec/libschroedinger.h @@ -23,8 +23,8 @@ * data structures common to libschroedingerdec.c and libschroedingerenc.c */ -#ifndef FFMPEG_LIBSCHROEDINGER_H -#define FFMPEG_LIBSCHROEDINGER_H +#ifndef AVCODEC_LIBSCHROEDINGER_H +#define AVCODEC_LIBSCHROEDINGER_H #include "config.h" @@ -58,4 +58,4 @@ int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt, SchroFrameFormat *schro_frame_fmt); #endif /* CONFIG_LIBSCHROEDINGER */ -#endif /* FFMPEG_LIBSCHROEDINGER_H */ +#endif /* AVCODEC_LIBSCHROEDINGER_H */ diff --git a/libavcodec/libxvid_internal.h b/libavcodec/libxvid_internal.h index bce30cebf2..1cf7589aa1 100644 --- a/libavcodec/libxvid_internal.h +++ b/libavcodec/libxvid_internal.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LIBXVID_INTERNAL_H -#define FFMPEG_LIBXVID_INTERNAL_H +#ifndef AVCODEC_LIBXVID_INTERNAL_H +#define AVCODEC_LIBXVID_INTERNAL_H /** * @file libxvid_internal.h @@ -29,4 +29,4 @@ int av_tempfile(char *prefix, char **filename); -#endif /* FFMPEG_LIBXVID_INTERNAL_H */ +#endif /* AVCODEC_LIBXVID_INTERNAL_H */ diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index 6586854e67..96f9f856f2 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LPC_H -#define FFMPEG_LPC_H +#ifndef AVCODEC_LPC_H +#define AVCODEC_LPC_H #include <stdint.h> #include "dsputil.h" @@ -45,4 +45,4 @@ int ff_lpc_calc_coefs(DSPContext *s, int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc, int omethod, int max_shift, int zero_shift); -#endif /* FFMPEG_LPC_H */ +#endif /* AVCODEC_LPC_H */ diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index d4bc4957db..2337756406 100644 --- a/libavcodec/lsp.h +++ b/libavcodec/lsp.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LSP_H -#define FFMPEG_LSP_H +#ifndef AVCODEC_LSP_H +#define AVCODEC_LSP_H #include <stdint.h> @@ -67,4 +67,4 @@ void ff_acelp_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order); */ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order); -#endif /* FFMPEG_LSP_H */ +#endif /* AVCODEC_LSP_H */ diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h index 161f0dce56..e8ff46c733 100644 --- a/libavcodec/lzw.h +++ b/libavcodec/lzw.h @@ -27,8 +27,8 @@ * Modified for use in TIFF by Konstantin Shishkov */ -#ifndef FFMPEG_LZW_H -#define FFMPEG_LZW_H +#ifndef AVCODEC_LZW_H +#define AVCODEC_LZW_H #include "bitstream.h" @@ -56,4 +56,4 @@ void ff_lzw_encode_init(struct LZWEncodeState * s, uint8_t * outbuf, int outsize int ff_lzw_encode(struct LZWEncodeState * s, const uint8_t * inbuf, int insize); int ff_lzw_encode_flush(struct LZWEncodeState * s); -#endif /* FFMPEG_LZW_H */ +#endif /* AVCODEC_LZW_H */ diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index 3b9bfeb09f..123fcb76c7 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -19,8 +19,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MATHOPS_H -#define FFMPEG_MATHOPS_H +#ifndef AVCODEC_MATHOPS_H +#define AVCODEC_MATHOPS_H #include "libavutil/common.h" @@ -83,5 +83,5 @@ static av_always_inline int MULH(int a, int b){ # define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb)) #endif -#endif /* FFMPEG_MATHOPS_H */ +#endif /* AVCODEC_MATHOPS_H */ diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 028f8c0d3f..f8741cc7a0 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -30,8 +30,8 @@ * MJPEG encoder and decoder. */ -#ifndef FFMPEG_MJPEG_H -#define FFMPEG_MJPEG_H +#ifndef AVCODEC_MJPEG_H +#define AVCODEC_MJPEG_H #include "avcodec.h" #include "bitstream.h" @@ -152,4 +152,4 @@ void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, const uint8_t *bits_table, const uint8_t *val_table); -#endif /* FFMPEG_MJPEG_H */ +#endif /* AVCODEC_MJPEG_H */ diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index d6022eb1e9..c973a9c2a2 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -26,8 +26,8 @@ * MJPEG decoder. */ -#ifndef FFMPEG_MJPEGDEC_H -#define FFMPEG_MJPEGDEC_H +#ifndef AVCODEC_MJPEGDEC_H +#define AVCODEC_MJPEGDEC_H #include "avcodec.h" #include "bitstream.h" @@ -108,4 +108,4 @@ int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s); int ff_mjpeg_decode_sos(MJpegDecodeContext *s); -#endif /* FFMPEG_MJPEGDEC_H */ +#endif /* AVCODEC_MJPEGDEC_H */ diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 02f8a714c3..4c904c3e7e 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -30,8 +30,8 @@ * MJPEG encoder. */ -#ifndef FFMPEG_MJPEGENC_H -#define FFMPEG_MJPEGENC_H +#ifndef AVCODEC_MJPEGENC_H +#define AVCODEC_MJPEGENC_H #include "dsputil.h" #include "mpegvideo.h" @@ -57,4 +57,4 @@ void ff_mjpeg_encode_dc(MpegEncContext *s, int val, uint8_t *huff_size, uint16_t *huff_code); void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]); -#endif /* FFMPEG_MJPEGENC_H */ +#endif /* AVCODEC_MJPEGENC_H */ diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h index bbb09e0b5a..338a7a3310 100644 --- a/libavcodec/mlp.h +++ b/libavcodec/mlp.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MLP_H -#define FFMPEG_MLP_H +#ifndef AVCODEC_MLP_H +#define AVCODEC_MLP_H #include <stdint.h> @@ -118,4 +118,4 @@ static inline uint8_t xor_32_to_8(uint32_t value) return value; } -#endif /* FFMPEG_MLP_H */ +#endif /* AVCODEC_MLP_H */ diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h index c3d26add4f..4199db04d7 100644 --- a/libavcodec/mlp_parser.h +++ b/libavcodec/mlp_parser.h @@ -24,8 +24,8 @@ * MLP parser prototypes */ -#ifndef FFMPEG_MLP_PARSER_H -#define FFMPEG_MLP_PARSER_H +#ifndef AVCODEC_MLP_PARSER_H +#define AVCODEC_MLP_PARSER_H #include "bitstream.h" @@ -55,5 +55,5 @@ typedef struct MLPHeaderInfo int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb); -#endif /* FFMPEG_MLP_PARSER_H */ +#endif /* AVCODEC_MLP_PARSER_H */ diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h index 0c1548992f..304013554a 100644 --- a/libavcodec/mpc.h +++ b/libavcodec/mpc.h @@ -25,8 +25,8 @@ * divided into 32 subbands. */ -#ifndef FFMPEG_MPC_H -#define FFMPEG_MPC_H +#ifndef AVCODEC_MPC_H +#define AVCODEC_MPC_H #include "libavutil/random.h" #include "avcodec.h" @@ -77,4 +77,4 @@ typedef struct { extern void ff_mpc_init(); extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst); -#endif /* FFMPEG_MPC_H */ +#endif /* AVCODEC_MPC_H */ diff --git a/libavcodec/mpc7data.h b/libavcodec/mpc7data.h index b9e64702ec..5609e8fbf3 100644 --- a/libavcodec/mpc7data.h +++ b/libavcodec/mpc7data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC7DATA_H -#define FFMPEG_MPC7DATA_H +#ifndef AVCODEC_MPC7DATA_H +#define AVCODEC_MPC7DATA_H #include <stdint.h> @@ -168,4 +168,4 @@ static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = { } }; -#endif /* FFMPEG_MPC7DATA_H */ +#endif /* AVCODEC_MPC7DATA_H */ diff --git a/libavcodec/mpc8data.h b/libavcodec/mpc8data.h index 280dd6ffd0..d6fbc1afb3 100644 --- a/libavcodec/mpc8data.h +++ b/libavcodec/mpc8data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC8DATA_H -#define FFMPEG_MPC8DATA_H +#ifndef AVCODEC_MPC8DATA_H +#define AVCODEC_MPC8DATA_H #include <stdint.h> @@ -118,4 +118,4 @@ const static uint32_t mpc8_cnk_lost[16][33] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 103, 55, 3347, 12419, 56459, 16987, 313105, 54177, 3076873, 3739321, 3132677, 66353813, 123012781, 236330717, 0} }; -#endif /* FFMPEG_MPC8DATA_H */ +#endif /* AVCODEC_MPC8DATA_H */ diff --git a/libavcodec/mpc8huff.h b/libavcodec/mpc8huff.h index 21e7730ce6..8491037aa4 100644 --- a/libavcodec/mpc8huff.h +++ b/libavcodec/mpc8huff.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC8HUFF_H -#define FFMPEG_MPC8HUFF_H +#ifndef AVCODEC_MPC8HUFF_H +#define AVCODEC_MPC8HUFF_H #include <stdint.h> @@ -575,4 +575,4 @@ static const int8_t mpc8_q8_bits[2][MPC8_Q8_SIZE] = { } }; -#endif /* FFMPEG_MPC8HUFF_H */ +#endif /* AVCODEC_MPC8HUFF_H */ diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h index 23ad06d9c5..a2212ecb25 100644 --- a/libavcodec/mpcdata.h +++ b/libavcodec/mpcdata.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPCDATA_H -#define FFMPEG_MPCDATA_H +#ifndef AVCODEC_MPCDATA_H +#define AVCODEC_MPCDATA_H #include <stdint.h> @@ -65,4 +65,4 @@ static const float mpc_SCF[128] = { 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789 }; -#endif /* FFMPEG_MPCDATA_H */ +#endif /* AVCODEC_MPCDATA_H */ diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 1e919b4d66..e65bb43d11 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG12_H -#define FFMPEG_MPEG12_H +#ifndef AVCODEC_MPEG12_H +#define AVCODEC_MPEG12_H #include "mpegvideo.h" @@ -56,4 +56,4 @@ static inline int decode_dc(GetBitContext *gb, int component) return diff; } -#endif /* FFMPEG_MPEG12_H */ +#endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index d15bf4baa9..5f04ac44bf 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -25,8 +25,8 @@ * MPEG1/2 tables. */ -#ifndef FFMPEG_MPEG12DATA_H -#define FFMPEG_MPEG12DATA_H +#ifndef AVCODEC_MPEG12DATA_H +#define AVCODEC_MPEG12DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -53,4 +53,4 @@ extern const AVRational ff_frame_rate_tab[]; extern const float ff_mpeg1_aspect[16]; extern const AVRational ff_mpeg2_aspect[16]; -#endif /* FFMPEG_MPEG12DATA_H */ +#endif /* AVCODEC_MPEG12DATA_H */ diff --git a/libavcodec/mpeg12decdata.h b/libavcodec/mpeg12decdata.h index c6ba2bb4d9..b6eada2c24 100644 --- a/libavcodec/mpeg12decdata.h +++ b/libavcodec/mpeg12decdata.h @@ -25,8 +25,8 @@ * MPEG1/2 decoder tables. */ -#ifndef FFMPEG_MPEG12DECDATA_H -#define FFMPEG_MPEG12DECDATA_H +#ifndef AVCODEC_MPEG12DECDATA_H +#define AVCODEC_MPEG12DECDATA_H #include <stdint.h> #include "mpegvideo.h" @@ -121,4 +121,4 @@ static const uint8_t * const mpeg2_dc_scale_table[4]={ mpeg2_dc_scale_table3, }; -#endif /* FFMPEG_MPEG12DECDATA_H */ +#endif /* AVCODEC_MPEG12DECDATA_H */ diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 06a1a366db..68ad310b55 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG4AUDIO_H -#define FFMPEG_MPEG4AUDIO_H +#ifndef AVCODEC_MPEG4AUDIO_H +#define AVCODEC_MPEG4AUDIO_H #include <stdint.h> @@ -46,4 +46,4 @@ extern const uint8_t ff_mpeg4audio_channels[8]; */ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_MPEGAUDIO_H */ +#endif /* AVCODEC_MPEG4AUDIO_H */ diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index ba8f9463cb..d149ad1c6e 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -25,8 +25,8 @@ * mpeg4 tables. */ -#ifndef FFMPEG_MPEG4DATA_H -#define FFMPEG_MPEG4DATA_H +#ifndef AVCODEC_MPEG4DATA_H +#define AVCODEC_MPEG4DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -429,4 +429,4 @@ static const uint8_t mpeg4_dc_threshold[8]={ 99, 13, 15, 17, 19, 21, 23, 0 }; -#endif /* FFMPEG_MPEG4DATA_H */ +#endif /* AVCODEC_MPEG4DATA_H */ diff --git a/libavcodec/mpeg4video_parser.h b/libavcodec/mpeg4video_parser.h index 125f6aa501..aaa62994ea 100644 --- a/libavcodec/mpeg4video_parser.h +++ b/libavcodec/mpeg4video_parser.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG4VIDEO_PARSER_H -#define FFMPEG_MPEG4VIDEO_PARSER_H +#ifndef AVCODEC_MPEG4VIDEO_PARSER_H +#define AVCODEC_MPEG4VIDEO_PARSER_H #include "parser.h" @@ -31,4 +31,4 @@ */ int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_MPEG4VIDEO_PARSER_H */ +#endif /* AVCODEC_MPEG4VIDEO_PARSER_H */ diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 6d602a1dcb..bf79d3b58c 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -23,8 +23,8 @@ * mpeg audio declarations for both encoder and decoder. */ -#ifndef FFMPEG_MPEGAUDIO_H -#define FFMPEG_MPEGAUDIO_H +#ifndef AVCODEC_MPEGAUDIO_H +#define AVCODEC_MPEGAUDIO_H #include "avcodec.h" #include "bitstream.h" @@ -152,4 +152,4 @@ static inline int ff_mpa_check_header(uint32_t header){ return 0; } -#endif /* FFMPEG_MPEGAUDIO_H */ +#endif /* AVCODEC_MPEGAUDIO_H */ diff --git a/libavcodec/mpegaudiodata.h b/libavcodec/mpegaudiodata.h index 55ea4f64e8..85277dfc22 100644 --- a/libavcodec/mpegaudiodata.h +++ b/libavcodec/mpegaudiodata.h @@ -24,8 +24,8 @@ * mpeg audio layer common tables. */ -#ifndef FFMPEG_MPEGAUDIODATA_H -#define FFMPEG_MPEGAUDIODATA_H +#ifndef AVCODEC_MPEGAUDIODATA_H +#define AVCODEC_MPEGAUDIODATA_H #include "libavutil/common.h" @@ -40,4 +40,4 @@ extern const int ff_mpa_quant_steps[17]; extern const int ff_mpa_quant_bits[17]; extern const unsigned char * const ff_mpa_alloc_tables[5]; -#endif /* FFMPEG_MPEGAUDIODATA_H */ +#endif /* AVCODEC_MPEGAUDIODATA_H */ diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h index 60f0365484..6f668e0e12 100644 --- a/libavcodec/mpegaudiodecheader.h +++ b/libavcodec/mpegaudiodecheader.h @@ -24,8 +24,8 @@ * MPEG Audio header decoder. */ -#ifndef FFMPEG_MPEGAUDIODECHEADER_H -#define FFMPEG_MPEGAUDIODECHEADER_H +#ifndef AVCODEC_MPEGAUDIODECHEADER_H +#define AVCODEC_MPEGAUDIODECHEADER_H #include "libavutil/common.h" #include "mpegaudio.h" @@ -36,4 +36,4 @@ that the frame size must be computed externally */ int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header); -#endif /* FFMPEG_MPEGAUDIODECHEADER_H */ +#endif /* AVCODEC_MPEGAUDIODECHEADER_H */ diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h index a41ff7aaa8..eea9cfbe22 100644 --- a/libavcodec/mpegaudiodectab.h +++ b/libavcodec/mpegaudiodectab.h @@ -24,8 +24,8 @@ * mpeg audio layer decoder tables. */ -#ifndef FFMPEG_MPEGAUDIODECTAB_H -#define FFMPEG_MPEGAUDIODECTAB_H +#ifndef AVCODEC_MPEGAUDIODECTAB_H +#define AVCODEC_MPEGAUDIODECTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -603,4 +603,4 @@ static const float ci_table[8] = { -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037, }; -#endif /* FFMPEG_MPEGAUDIODECTAB_H */ +#endif /* AVCODEC_MPEGAUDIODECTAB_H */ diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h index 61ea471b1c..c82c1b9b7a 100644 --- a/libavcodec/mpegaudiotab.h +++ b/libavcodec/mpegaudiotab.h @@ -27,8 +27,8 @@ * Most of them come from the mpeg audio specification. */ -#ifndef FFMPEG_MPEGAUDIOTAB_H -#define FFMPEG_MPEGAUDIOTAB_H +#ifndef AVCODEC_MPEGAUDIOTAB_H +#define AVCODEC_MPEGAUDIOTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -115,4 +115,4 @@ static const float fixed_smr[SBLIMIT] = { static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 }; -#endif /* FFMPEG_MPEGAUDIOTAB_H */ +#endif /* AVCODEC_MPEGAUDIOTAB_H */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 255e1f2080..d2c46e31cb 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -25,8 +25,8 @@ * mpegvideo header. */ -#ifndef FFMPEG_MPEGVIDEO_H -#define FFMPEG_MPEGVIDEO_H +#ifndef AVCODEC_MPEGVIDEO_H +#define AVCODEC_MPEGVIDEO_H #include "dsputil.h" #include "bitstream.h" @@ -863,5 +863,5 @@ void ff_wmv2_encode_mb(MpegEncContext * s, DCTELEM block[6][64], int motion_x, int motion_y); -#endif /* FFMPEG_MPEGVIDEO_H */ +#endif /* AVCODEC_MPEGVIDEO_H */ diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index 4f3396f589..034217e156 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -27,8 +27,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ -#ifndef FFMPEG_MPEGVIDEO_COMMON_H -#define FFMPEG_MPEGVIDEO_COMMON_H +#ifndef AVCODEC_MPEGVIDEO_COMMON_H +#define AVCODEC_MPEGVIDEO_COMMON_H #include "avcodec.h" #include "dsputil.h" @@ -898,4 +898,4 @@ static inline void MPV_motion(MpegEncContext *s, MPV_motion_internal(s, dest_y, dest_cb, dest_cr, dir, ref_picture, pix_op, qpix_op, 0); } -#endif /* FFMPEG_MPEGVIDEO_COMMON_H */ +#endif /* AVCODEC_MPEGVIDEO_COMMON_H */ diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index 17288b8e28..3226015be2 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -23,8 +23,8 @@ * @file msmpeg4.h */ -#ifndef FFMPEG_MSMPEG4_H -#define FFMPEG_MSMPEG4_H +#ifndef AVCODEC_MSMPEG4_H +#define AVCODEC_MSMPEG4_H #include "config.h" #include "avcodec.h" @@ -62,4 +62,4 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]); #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER) #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER) -#endif /* FFMPEG_MSMPEG4_H */ +#endif /* AVCODEC_MSMPEG4_H */ diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 0234027288..b9ffb27197 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -27,8 +27,8 @@ * MSMPEG4 data tables. */ -#ifndef FFMPEG_MSMPEG4DATA_H -#define FFMPEG_MSMPEG4DATA_H +#ifndef AVCODEC_MSMPEG4DATA_H +#define AVCODEC_MSMPEG4DATA_H #include "libavutil/common.h" #include "bitstream.h" @@ -96,4 +96,4 @@ extern const uint32_t (*wmv2_inter_table[WMV2_INTER_CBP_TABLE_COUNT])[2]; extern const uint8_t wmv2_scantableA[64]; extern const uint8_t wmv2_scantableB[64]; -#endif /* FFMPEG_MSMPEG4DATA_H */ +#endif /* AVCODEC_MSMPEG4DATA_H */ diff --git a/libavcodec/nellymoser.h b/libavcodec/nellymoser.h index 4f415dedb9..6a7526dbf0 100644 --- a/libavcodec/nellymoser.h +++ b/libavcodec/nellymoser.h @@ -31,8 +31,8 @@ * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ -#ifndef FFMPEG_NELLYMOSER_H -#define FFMPEG_NELLYMOSER_H +#ifndef AVCODEC_NELLYMOSER_H +#define AVCODEC_NELLYMOSER_H #include "avcodec.h" diff --git a/libavcodec/opt.h b/libavcodec/opt.h index 4add25c5f8..557c430075 100644 --- a/libavcodec/opt.h +++ b/libavcodec/opt.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_OPT_H -#define FFMPEG_OPT_H +#ifndef AVCODEC_OPT_H +#define AVCODEC_OPT_H /** * @file opt.h @@ -141,4 +141,4 @@ int av_opt_show(void *obj, void *av_log_obj); void av_opt_set_defaults(void *s); void av_opt_set_defaults2(void *s, int mask, int flags); -#endif /* FFMPEG_OPT_H */ +#endif /* AVCODEC_OPT_H */ diff --git a/libavcodec/parser.h b/libavcodec/parser.h index 80ee6894e0..4150870c84 100644 --- a/libavcodec/parser.h +++ b/libavcodec/parser.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PARSER_H -#define FFMPEG_PARSER_H +#ifndef AVCODEC_PARSER_H +#define AVCODEC_PARSER_H #include "avcodec.h" @@ -66,4 +66,4 @@ void ff_parse1_close(AVCodecParserContext *s); */ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove); -#endif /* FFMPEG_PARSER_H */ +#endif /* AVCODEC_PARSER_H */ diff --git a/libavcodec/png.h b/libavcodec/png.h index 6e16f62e0f..0fde3f41d6 100644 --- a/libavcodec/png.h +++ b/libavcodec/png.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PNG_H -#define FFMPEG_PNG_H +#ifndef AVCODEC_PNG_H +#define AVCODEC_PNG_H #include <stdint.h> @@ -74,4 +74,4 @@ extern int ff_png_get_nb_channels(int color_type); /* compute the row size of an interleaved pass */ extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width); -#endif /* FFMPEG_PNG_H */ +#endif /* AVCODEC_PNG_H */ diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h index c77bcca09e..8aa4276373 100644 --- a/libavcodec/pnm.h +++ b/libavcodec/pnm.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PNM_H -#define FFMPEG_PNM_H +#ifndef AVCODEC_PNM_H +#define AVCODEC_PNM_H #include "avcodec.h" @@ -34,4 +34,4 @@ typedef struct PNMContext { int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); -#endif /* FFMPEG_PNM_H */ +#endif /* AVCODEC_PNM_H */ diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index 43bd5ababf..63f817a215 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_ALTIVEC_H -#define FFMPEG_DSPUTIL_ALTIVEC_H +#ifndef AVCODEC_PPC_DSPUTIL_ALTIVEC_H +#define AVCODEC_PPC_DSPUTIL_ALTIVEC_H #include <stdint.h> @@ -31,4 +31,4 @@ void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); -#endif /* FFMPEG_DSPUTIL_ALTIVEC_H */ +#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */ diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h index 1276661b02..0fc8b3c377 100644 --- a/libavcodec/ppc/dsputil_ppc.h +++ b/libavcodec/ppc/dsputil_ppc.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_PPC_H -#define FFMPEG_DSPUTIL_PPC_H +#ifndef AVCODEC_PPC_DSPUTIL_PPC_H +#define AVCODEC_PPC_DSPUTIL_PPC_H #ifdef CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); @@ -149,4 +149,4 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) #endif /* CONFIG_POWERPC_PERF */ -#endif /* FFMPEG_DSPUTIL_PPC_H */ +#endif /* AVCODEC_PPC_DSPUTIL_PPC_H */ diff --git a/libavcodec/ppc/gcc_fixes.h b/libavcodec/ppc/gcc_fixes.h index b8a908a615..01b1c18567 100644 --- a/libavcodec/ppc/gcc_fixes.h +++ b/libavcodec/ppc/gcc_fixes.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_GCC_FIXES_H -#define FFMPEG_GCC_FIXES_H +#ifndef AVCODEC_PPC_GCC_FIXES_H +#define AVCODEC_PPC_GCC_FIXES_H #include "config.h" @@ -99,4 +99,4 @@ __ch (__bin_args_eq (vector unsigned int, (a1), vector unsigned int, (a2)), \ #endif /* (__GNUC__ == 3 && __GNUC_MINOR__ < 3) */ -#endif /* FFMPEG_GCC_FIXES_H */ +#endif /* AVCODEC_PPC_GCC_FIXES_H */ diff --git a/libavcodec/ppc/imgresample_altivec.h b/libavcodec/ppc/imgresample_altivec.h index 538c1bee64..27b85f9a84 100644 --- a/libavcodec/ppc/imgresample_altivec.h +++ b/libavcodec/ppc/imgresample_altivec.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H -#define FFMPEG_IMGRESAMPLE_ALTIVEC_H +#ifndef AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H +#define AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H #include <stdint.h> void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src, int wrap, int16_t *filter); -#endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */ +#endif /* AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H */ diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h index 2259f2af09..b530ce5523 100644 --- a/libavcodec/ppc/mathops.h +++ b/libavcodec/ppc/mathops.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PPC_MATHOPS_H -#define FFMPEG_PPC_MATHOPS_H +#ifndef AVCODEC_PPC_MATHOPS_H +#define AVCODEC_PPC_MATHOPS_H #if defined(ARCH_POWERPC_405) /* signed 16x16 -> 32 multiply add accumulate */ @@ -35,4 +35,4 @@ __rt; }) #endif -#endif /* FFMPEG_PPC_MATHOPS_H */ +#endif /* AVCODEC_PPC_MATHOPS_H */ diff --git a/libavcodec/ppc/types_altivec.h b/libavcodec/ppc/types_altivec.h index 6d41a928bf..30963c2938 100644 --- a/libavcodec/ppc/types_altivec.h +++ b/libavcodec/ppc/types_altivec.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_TYPES_ALTIVEC_H -#define FFMPEG_TYPES_ALTIVEC_H +#ifndef AVCODEC_PPC_TYPES_ALTIVEC_H +#define AVCODEC_PPC_TYPES_ALTIVEC_H /*********************************************************************** * Vector types @@ -43,4 +43,4 @@ #define zero_u32v (vec_u32_t) zerov #define zero_s32v (vec_s32_t) zerov -#endif /* FFMPEG_TYPES_ALTIVEC_H */ +#endif /* AVCODEC_PPC_TYPES_ALTIVEC_H */ diff --git a/libavcodec/ppc/util_altivec.h b/libavcodec/ppc/util_altivec.h index 74fc2ab1ce..c54d0ea4c1 100644 --- a/libavcodec/ppc/util_altivec.h +++ b/libavcodec/ppc/util_altivec.h @@ -21,8 +21,8 @@ * Contains misc utility macros and inline functions */ -#ifndef FFMPEG_UTIL_ALTIVEC_H -#define FFMPEG_UTIL_ALTIVEC_H +#ifndef AVCODEC_PPC_UTIL_ALTIVEC_H +#define AVCODEC_PPC_UTIL_ALTIVEC_H #include <stdint.h> @@ -102,4 +102,4 @@ static inline vector unsigned char unaligned_load(int offset, uint8_t *src) return vec_perm(first, second, mask); } -#endif /* FFMPEG_UTIL_ALTIVEC_H */ +#endif /* AVCODEC_PPC_UTIL_ALTIVEC_H */ diff --git a/libavcodec/ps2/mmi.h b/libavcodec/ps2/mmi.h index 2c5ecb01dc..81905e0dd6 100644 --- a/libavcodec/ps2/mmi.h +++ b/libavcodec/ps2/mmi.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MMI_H -#define FFMPEG_MMI_H +#ifndef AVCODEC_PS2_MMI_H +#define AVCODEC_PS2_MMI_H #define align16 __attribute__ ((aligned (16))) @@ -168,4 +168,4 @@ #define pextlb(rs, rt, rd) \ asm volatile ("pextlb " #rd ", " #rs ", " #rt ) -#endif /* FFMPEG_MMI_H */ +#endif /* AVCODEC_PS2_MMI_H */ diff --git a/libavcodec/qdm2data.h b/libavcodec/qdm2data.h index 8e2d87581f..166e720fc9 100644 --- a/libavcodec/qdm2data.h +++ b/libavcodec/qdm2data.h @@ -27,8 +27,8 @@ * Various QDM2 tables. */ -#ifndef FFMPEG_QDM2DATA_H -#define FFMPEG_QDM2DATA_H +#ifndef AVCODEC_QDM2DATA_H +#define AVCODEC_QDM2DATA_H #include <stdint.h> @@ -528,4 +528,4 @@ static const float type34_delta[10] = { // FIXME: covers 8 entries.. 0.138071194291115f,0.333333343267441f,0.60947573184967f,1.0f,0.0f, }; -#endif /* FFMPEG_QDM2DATA_H */ +#endif /* AVCODEC_QDM2DATA_H */ diff --git a/libavcodec/ra144.h b/libavcodec/ra144.h index 11e0c25f86..986ee2ba01 100644 --- a/libavcodec/ra144.h +++ b/libavcodec/ra144.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RA144_H -#define FFMPEG_RA144_H +#ifndef AVCODEC_RA144_H +#define AVCODEC_RA144_H #include <stdint.h> @@ -1552,4 +1552,4 @@ static const int16_t * const lpc_refl_cb[10]={ lpc_refl_cb6, lpc_refl_cb7, lpc_refl_cb8, lpc_refl_cb9, lpc_refl_cb10 }; -#endif /* FFMPEG_RA144_H */ +#endif /* AVCODEC_RA144_H */ diff --git a/libavcodec/ra288.h b/libavcodec/ra288.h index c6b24d4d3c..26fa65a313 100644 --- a/libavcodec/ra288.h +++ b/libavcodec/ra288.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RA288_H -#define FFMPEG_RA288_H +#ifndef AVCODEC_RA288_H +#define AVCODEC_RA288_H static const float amptable[8]={ 0.515625, 0.90234375, 1.57910156, 2.76342773, @@ -206,4 +206,4 @@ static const float gain_bw_tab[10]={ 0.553955078, 0.50201416, 0.454956055, 0.41229248, 0.373657227 }; -#endif /* FFMPEG_RA288_H */ +#endif /* AVCODEC_RA288_H */ diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 7d23b252d0..1e47231539 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -24,8 +24,8 @@ * Range coder. */ -#ifndef FFMPEG_RANGECODER_H -#define FFMPEG_RANGECODER_H +#ifndef AVCODEC_RANGECODER_H +#define AVCODEC_RANGECODER_H #include <stdint.h> #include <assert.h> @@ -138,4 +138,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){ #endif } -#endif /* FFMPEG_RANGECODER_H */ +#endif /* AVCODEC_RANGECODER_H */ diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 8704b43014..a1017751e2 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RATECONTROL_H -#define FFMPEG_RATECONTROL_H +#ifndef AVCODEC_RATECONTROL_H +#define AVCODEC_RATECONTROL_H /** * @file ratecontrol.h @@ -101,5 +101,5 @@ int ff_xvid_rate_control_init(struct MpegEncContext *s); void ff_xvid_rate_control_uninit(struct MpegEncContext *s); float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run); -#endif /* FFMPEG_RATECONTROL_H */ +#endif /* AVCODEC_RATECONTROL_H */ diff --git a/libavcodec/raw.h b/libavcodec/raw.h index 1110114e25..e600dca395 100644 --- a/libavcodec/raw.h +++ b/libavcodec/raw.h @@ -24,8 +24,8 @@ * Raw Video Codec */ -#ifndef FFMPEG_RAW_H -#define FFMPEG_RAW_H +#ifndef AVCODEC_RAW_H +#define AVCODEC_RAW_H #include "avcodec.h" @@ -36,4 +36,4 @@ typedef struct PixelFormatTag { extern const PixelFormatTag ff_raw_pixelFormatTags[]; -#endif /* FFMPEG_RAW_H */ +#endif /* AVCODEC_RAW_H */ diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h index b2452abb2d..a1dfb5cf99 100644 --- a/libavcodec/rectangle.h +++ b/libavcodec/rectangle.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_RECTANGLE_H -#define FFMPEG_RECTANGLE_H +#ifndef AVCODEC_RECTANGLE_H +#define AVCODEC_RECTANGLE_H #include "libavutil/common.h" @@ -118,4 +118,4 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride, assert(h==4); } -#endif /* FFMPEG_RECTANGLE_H */ +#endif /* AVCODEC_RECTANGLE_H */ diff --git a/libavcodec/rl.h b/libavcodec/rl.h index d71d3711bd..20fd8c1c11 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -24,8 +24,8 @@ * rl header. */ -#ifndef FFMPEG_RL_H -#define FFMPEG_RL_H +#ifndef AVCODEC_RL_H +#define AVCODEC_RL_H #include <stdint.h> #include "bitstream.h" @@ -83,4 +83,4 @@ static inline int get_rl_index(const RLTable *rl, int last, int run, int level) return index + level - 1; } -#endif /* FFMPEG_RL_H */ +#endif /* AVCODEC_RL_H */ diff --git a/libavcodec/rle.h b/libavcodec/rle.h index 14d07084f6..f892443266 100644 --- a/libavcodec/rle.h +++ b/libavcodec/rle.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RLE_H -#define FFMPEG_RLE_H +#ifndef AVCODEC_RLE_H +#define AVCODEC_RLE_H #include <stdint.h> @@ -36,4 +36,4 @@ int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp, int w, int add_rep, int xor_rep, int add_raw, int xor_raw); -#endif /* FFMPEG_RLE_H */ +#endif /* AVCODEC_RLE_H */ diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index e7af474da8..03c03ed516 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ROQVIDEO_H -#define FFMPEG_ROQVIDEO_H +#ifndef AVCODEC_ROQVIDEO_H +#define AVCODEC_ROQVIDEO_H #include "libavutil/random.h" #include "avcodec.h" @@ -89,4 +89,4 @@ void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay); void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); -#endif /* FFMPEG_ROQVIDEO_H */ +#endif /* AVCODEC_ROQVIDEO_H */ diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h index a5b377de53..02f2058b2c 100644 --- a/libavcodec/rtjpeg.h +++ b/libavcodec/rtjpeg.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RTJPEG_H -#define FFMPEG_RTJPEG_H +#ifndef AVCODEC_RTJPEG_H +#define AVCODEC_RTJPEG_H #include <stdint.h> #include "dsputil.h" @@ -39,4 +39,4 @@ void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_RTJPEG_H */ +#endif /* AVCODEC_RTJPEG_H */ diff --git a/libavcodec/rv30data.h b/libavcodec/rv30data.h index 98ccb352d1..c16e51baeb 100644 --- a/libavcodec/rv30data.h +++ b/libavcodec/rv30data.h @@ -24,8 +24,8 @@ * miscellaneous RV30 tables */ -#ifndef FFMPEG_RV30DATA_H -#define FFMPEG_RV30DATA_H +#ifndef AVCODEC_RV30DATA_H +#define AVCODEC_RV30DATA_H #include <stdint.h> @@ -171,4 +171,4 @@ static const uint8_t rv30_itype_from_context[900] = { 2, 7, 8, 4, 0, 6, 1, 5, 3, 2, 8, 3, 0, 7, 4, 1, 6, 5, }; -#endif /* FFMPEG_RV30DATA_H */ +#endif /* AVCODEC_RV30DATA_H */ diff --git a/libavcodec/rv34.h b/libavcodec/rv34.h index df85fb89ec..2dadedc4fc 100644 --- a/libavcodec/rv34.h +++ b/libavcodec/rv34.h @@ -24,8 +24,8 @@ * RV30 and RV40 decoder common data declarations */ -#ifndef FFMPEG_RV34_H -#define FFMPEG_RV34_H +#ifndef AVCODEC_RV34_H +#define AVCODEC_RV34_H #include "avcodec.h" #include "dsputil.h" @@ -122,4 +122,4 @@ int ff_rv34_decode_init(AVCodecContext *avctx); int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size); int ff_rv34_decode_end(AVCodecContext *avctx); -#endif /* FFMPEG_RV34_H */ +#endif /* AVCODEC_RV34_H */ diff --git a/libavcodec/rv34data.h b/libavcodec/rv34data.h index 25256e23dd..e4862a3ba0 100644 --- a/libavcodec/rv34data.h +++ b/libavcodec/rv34data.h @@ -24,8 +24,8 @@ * miscellaneous RV30/40 tables */ -#ifndef FFMPEG_RV34DATA_H -#define FFMPEG_RV34DATA_H +#ifndef AVCODEC_RV34DATA_H +#define AVCODEC_RV34DATA_H #include <stdint.h> @@ -145,4 +145,4 @@ static const uint16_t rv34_mb_max_sizes[6] = { 0x2F, 0x68, 0x18B, 0x62F, 0x18BF, */ static const uint8_t rv34_mb_bits_sizes[6] = { 6, 7, 9, 11, 13, 14 }; -#endif /* FFMPEG_RV34DATA_H */ +#endif /* AVCODEC_RV34DATA_H */ diff --git a/libavcodec/rv34vlc.h b/libavcodec/rv34vlc.h index ef3cfbab31..ffee907f95 100644 --- a/libavcodec/rv34vlc.h +++ b/libavcodec/rv34vlc.h @@ -24,8 +24,8 @@ * RV30/40 VLC tables */ -#ifndef FFMPEG_RV34VLC_H -#define FFMPEG_RV34VLC_H +#ifndef AVCODEC_RV34VLC_H +#define AVCODEC_RV34VLC_H #include <stdint.h> @@ -4051,4 +4051,4 @@ static const uint8_t rv34_inter_coeff[NUM_INTER_TABLES][COEFF_VLC_SIZE] = { } }; -#endif /* FFMPEG_RV34VLC_H */ +#endif /* AVCODEC_RV34VLC_H */ diff --git a/libavcodec/rv40data.h b/libavcodec/rv40data.h index 17bcb04cff..b81b393184 100644 --- a/libavcodec/rv40data.h +++ b/libavcodec/rv40data.h @@ -24,8 +24,8 @@ * miscellaneous RV40 tables */ -#ifndef FFMPEG_RV40DATA_H -#define FFMPEG_RV40DATA_H +#ifndef AVCODEC_RV40DATA_H +#define AVCODEC_RV40DATA_H #include <stdint.h> @@ -112,4 +112,4 @@ static const uint8_t rv40_filter_clip_tbl[3][32] = { }; /** @} */ // end loopfilter group -#endif /* FFMPEG_RV40DATA_H */ +#endif /* AVCODEC_RV40DATA_H */ diff --git a/libavcodec/rv40vlc2.h b/libavcodec/rv40vlc2.h index f1664fcd6a..3b17d8faa0 100644 --- a/libavcodec/rv40vlc2.h +++ b/libavcodec/rv40vlc2.h @@ -24,8 +24,8 @@ * RV40 VLC tables used for macroblock information decoding */ -#ifndef FFMPEG_RV40VLC2_H -#define FFMPEG_RV40VLC2_H +#ifndef AVCODEC_RV40VLC2_H +#define AVCODEC_RV40VLC2_H #include <stdint.h> @@ -703,4 +703,4 @@ static const uint8_t block_num_to_btype_vlc_num[12] = { 0, 1, 0, 0, 2, 3, 0, 5, 0, 0, 4, 0 }; //@} -#endif /* FFMPEG_RV40VLC2_H */ +#endif /* AVCODEC_RV40VLC2_H */ diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h index 9ead901b6e..4919c0748a 100644 --- a/libavcodec/s3tc.h +++ b/libavcodec/s3tc.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_S3TC_H -#define FFMPEG_S3TC_H +#ifndef AVCODEC_S3TC_H +#define AVCODEC_S3TC_H #include <stdint.h> @@ -50,4 +50,4 @@ void ff_decode_dxt3(const uint8_t *src, uint8_t *dst, const unsigned int w, const unsigned int h, const unsigned int stride); -#endif /* FFMPEG_S3TC_H */ +#endif /* AVCODEC_S3TC_H */ diff --git a/libavcodec/sgi.h b/libavcodec/sgi.h index 8c658761dc..be17f2e237 100644 --- a/libavcodec/sgi.h +++ b/libavcodec/sgi.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SGI_H -#define FFMPEG_SGI_H +#ifndef AVCODEC_SGI_H +#define AVCODEC_SGI_H /** * SGI image file signature @@ -33,4 +33,4 @@ #define SGI_RGB 3 #define SGI_RGBA 4 -#endif /* FFMPEG_SGI_H */ +#endif /* AVCODEC_SGI_H */ diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h index 6ae48a24e5..c3611e2f50 100644 --- a/libavcodec/simple_idct.h +++ b/libavcodec/simple_idct.h @@ -25,8 +25,8 @@ * simple idct header. */ -#ifndef FFMPEG_SIMPLE_IDCT_H -#define FFMPEG_SIMPLE_IDCT_H +#ifndef AVCODEC_SIMPLE_IDCT_H +#define AVCODEC_SIMPLE_IDCT_H #include <stdint.h> #include "dsputil.h" @@ -44,4 +44,4 @@ void ff_simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_SIMPLE_IDCT_H */ +#endif /* AVCODEC_SIMPLE_IDCT_H */ diff --git a/libavcodec/snow.h b/libavcodec/snow.h index e9b988986c..6f0d79f12a 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SNOW_H -#define FFMPEG_SNOW_H +#ifndef AVCODEC_SNOW_H +#define AVCODEC_SNOW_H #include "dsputil.h" @@ -171,4 +171,4 @@ static av_always_inline void snow_horizontal_compose_liftS_lead_out(int i, IDWTE } } -#endif /* FFMPEG_SNOW_H */ +#endif /* AVCODEC_SNOW_H */ diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h index e93408b34c..b2c53cc4fe 100644 --- a/libavcodec/sp5x.h +++ b/libavcodec/sp5x.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SP5X_H -#define FFMPEG_SP5X_H +#ifndef AVCODEC_SP5X_H +#define AVCODEC_SP5X_H #include <stdint.h> @@ -331,4 +331,4 @@ static const uint8_t sp5x_quant_table_orig[18][64] = }; #endif -#endif /* FFMPEG_SP5X_H */ +#endif /* AVCODEC_SP5X_H */ diff --git a/libavcodec/sparc/vis.h b/libavcodec/sparc/vis.h index 2596f3e617..e0b7c95143 100644 --- a/libavcodec/sparc/vis.h +++ b/libavcodec/sparc/vis.h @@ -40,8 +40,8 @@ * the assembler to keep the binary from becoming tainted. */ -#ifndef FFMPEG_VIS_H -#define FFMPEG_VIS_H +#ifndef AVCODEC_SPARC_VIS_H +#define AVCODEC_SPARC_VIS_H #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) @@ -329,4 +329,4 @@ static inline void vis_alignaddrl_g0(void *_ptr) #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) -#endif /* FFMPEG_VIS_H */ +#endif /* AVCODEC_SPARC_VIS_H */ diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h index 7764dd8dd9..bf2ee79432 100644 --- a/libavcodec/svq1.h +++ b/libavcodec/svq1.h @@ -32,8 +32,8 @@ * http://www.pcisys.net/~melanson/codecs/ */ -#ifndef FFMPEG_SVQ1_H -#define FFMPEG_SVQ1_H +#ifndef AVCODEC_SVQ1_H +#define AVCODEC_SVQ1_H #include <stdint.h> @@ -58,4 +58,4 @@ extern const uint16_t ff_svq1_inter_mean_vlc[512][2]; extern const svq1_frame_size_t ff_svq1_frame_size_table[8]; -#endif /* FFMPEG_SVQ1_H */ +#endif /* AVCODEC_SVQ1_H */ diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h index f4a4054d1c..87ac71e666 100644 --- a/libavcodec/svq1_cb.h +++ b/libavcodec/svq1_cb.h @@ -28,8 +28,8 @@ * svq1 code books. */ -#ifndef FFMPEG_SVQ1_CB_H -#define FFMPEG_SVQ1_CB_H +#ifndef AVCODEC_SVQ1_CB_H +#define AVCODEC_SVQ1_CB_H #include <stdint.h> #include <stdlib.h> @@ -1520,4 +1520,4 @@ const int8_t* const ff_svq1_intra_codebooks[6] = { NULL, NULL, }; -#endif /* FFMPEG_SVQ1_CB_H */ +#endif /* AVCODEC_SVQ1_CB_H */ diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h index 05fb12aad2..272597e1e0 100644 --- a/libavcodec/svq1_vlc.h +++ b/libavcodec/svq1_vlc.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SVQ1_VLC_H -#define FFMPEG_SVQ1_VLC_H +#ifndef AVCODEC_SVQ1_VLC_H +#define AVCODEC_SVQ1_VLC_H #include <stdint.h> @@ -280,4 +280,4 @@ const uint16_t ff_svq1_inter_mean_vlc[512][2] = { { 0x3, 22 }, { 0x2, 22 }, { 0x1, 22 }, { 0x0, 22 } }; -#endif /* FFMPEG_SVQ1_VLC_H */ +#endif /* AVCODEC_SVQ1_VLC_H */ diff --git a/libavcodec/svq1enc_cb.h b/libavcodec/svq1enc_cb.h index 1feeed0ab6..c97b92de89 100644 --- a/libavcodec/svq1enc_cb.h +++ b/libavcodec/svq1enc_cb.h @@ -24,8 +24,8 @@ * svq1 code books. */ -#ifndef FFMPEG_SVQ1ENC_CB_H -#define FFMPEG_SVQ1ENC_CB_H +#ifndef AVCODEC_SVQ1ENC_CB_H +#define AVCODEC_SVQ1ENC_CB_H #include <stdint.h> @@ -93,4 +93,4 @@ static const int8_t svq1_intra_codebook_sum[4][16*6] = { } }; -#endif /* FFMPEG_SVQ1ENC_CB_H */ +#endif /* AVCODEC_SVQ1ENC_CB_H */ diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index c5687d7df6..1c515927a5 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -24,8 +24,8 @@ * @file tiff.h * @author Konstantin Shishkov */ -#ifndef FFMPEG_TIFF_H -#define FFMPEG_TIFF_H +#ifndef AVCODEC_TIFF_H +#define AVCODEC_TIFF_H #include <stdint.h> @@ -83,4 +83,4 @@ static const uint8_t type_sizes[6] = { 0, 1, 100, 2, 4, 8 }; -#endif /* FFMPEG_TIFF_H */ +#endif /* AVCODEC_TIFF_H */ diff --git a/libavcodec/truemotion1data.h b/libavcodec/truemotion1data.h index 033e25e059..4b35e9869c 100644 --- a/libavcodec/truemotion1data.h +++ b/libavcodec/truemotion1data.h @@ -22,8 +22,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_TRUEMOTION1DATA_H -#define FFMPEG_TRUEMOTION1DATA_H +#ifndef AVCODEC_TRUEMOTION1DATA_H +#define AVCODEC_TRUEMOTION1DATA_H #include <stdint.h> #include <stdlib.h> @@ -830,4 +830,4 @@ static const uint8_t pc_tbl4[] = { static const uint8_t * const tables[] = { pc_tbl2, pc_tbl3, pc_tbl4 }; -#endif /* FFMPEG_TRUEMOTION1DATA_H */ +#endif /* AVCODEC_TRUEMOTION1DATA_H */ diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h index 572387cd7a..eef7da8eee 100644 --- a/libavcodec/truespeech_data.h +++ b/libavcodec/truespeech_data.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_TRUESPEECH_DATA_H -#define FFMPEG_TRUESPEECH_DATA_H +#ifndef AVCODEC_TRUESPEECH_DATA_H +#define AVCODEC_TRUESPEECH_DATA_H #include <stdint.h> @@ -156,4 +156,4 @@ static const int16_t ts_5E2[8] = static const int16_t ts_5F2[8] = { 0x6000, 0x4800, 0x3600, 0x2880, 0x1E60, 0x16C8, 0x1116, 0x0CD1 }; -#endif /* FFMPEG_TRUESPEECH_DATA_H */ +#endif /* AVCODEC_TRUESPEECH_DATA_H */ diff --git a/libavcodec/ulti_cb.h b/libavcodec/ulti_cb.h index e7bd3b86b0..7061d839a8 100644 --- a/libavcodec/ulti_cb.h +++ b/libavcodec/ulti_cb.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ULTI_CB_H -#define FFMPEG_ULTI_CB_H +#ifndef AVCODEC_ULTI_CB_H +#define AVCODEC_ULTI_CB_H static const unsigned char ulti_codebook[16384]={ 0x00, 0x01, 0x01, 0x02, @@ -4121,4 +4121,4 @@ static const unsigned char ulti_codebook[16384]={ 0x3D, 0x3E, 0x3E, 0x3F }; -#endif /* FFMPEG_ULTI_CB_H */ +#endif /* AVCODEC_ULTI_CB_H */ diff --git a/libavcodec/unary.h b/libavcodec/unary.h index abd7a531b1..5484be4d56 100644 --- a/libavcodec/unary.h +++ b/libavcodec/unary.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_UNARY_H -#define FFMPEG_UNARY_H +#ifndef AVCODEC_UNARY_H +#define AVCODEC_UNARY_H #include "bitstream.h" @@ -53,4 +53,4 @@ static inline int get_unary_0_9(GetBitContext *gb) return get_unary(gb, 0, 9); } -#endif /* FFMPEG_UNARY_H */ +#endif /* AVCODEC_UNARY_H */ diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index db9029add0..4cd7bb1912 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VC1_H -#define FFMPEG_VC1_H +#ifndef AVCODEC_VC1_H +#define AVCODEC_VC1_H #include "avcodec.h" #include "mpegvideo.h" @@ -308,4 +308,4 @@ typedef struct VC1Context{ uint32_t *cbp_base, *cbp; } VC1Context; -#endif /* FFMPEG_VC1_H */ +#endif /* AVCODEC_VC1_H */ diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h index f775283ddb..78de0f9a24 100644 --- a/libavcodec/vc1acdata.h +++ b/libavcodec/vc1acdata.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VC1ACDATA_H -#define FFMPEG_VC1ACDATA_H +#ifndef AVCODEC_VC1ACDATA_H +#define AVCODEC_VC1ACDATA_H #include <stdint.h> @@ -589,4 +589,4 @@ static const uint8_t vc1_last_delta_run_table[AC_MODES][10] = { } }; -#endif /* FFMPEG_VC1ACDATA_H */ +#endif /* AVCODEC_VC1ACDATA_H */ diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index 98ffe574f5..714d83a353 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -25,8 +25,8 @@ * VC-1 tables. */ -#ifndef FFMPEG_VC1DATA_H -#define FFMPEG_VC1DATA_H +#ifndef AVCODEC_VC1DATA_H +#define AVCODEC_VC1DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -154,4 +154,4 @@ extern const int8_t ff_vc1_adv_interlaced_4x4_zz [16]; /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */ extern const int32_t ff_vc1_dqscale[63]; -#endif /* FFMPEG_VC1DATA_H */ +#endif /* AVCODEC_VC1DATA_H */ diff --git a/libavcodec/vorbis.h b/libavcodec/vorbis.h index 48d0030dfe..b8a8410229 100644 --- a/libavcodec/vorbis.h +++ b/libavcodec/vorbis.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VORBIS_H -#define FFMPEG_VORBIS_H +#ifndef AVCODEC_VORBIS_H +#define AVCODEC_VORBIS_H #include "avcodec.h" @@ -40,4 +40,4 @@ void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16 #define ilog(i) av_log2(2*(i)) -#endif /* FFMPEG_VORBIS_H */ +#endif /* AVCODEC_VORBIS_H */ diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h index 1b4be9aaa1..7b6347cd87 100644 --- a/libavcodec/vorbis_enc_data.h +++ b/libavcodec/vorbis_enc_data.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VORBIS_ENC_DATA_H -#define FFMPEG_VORBIS_ENC_DATA_H +#ifndef AVCODEC_VORBIS_ENC_DATA_H +#define AVCODEC_VORBIS_ENC_DATA_H #include <stdint.h> @@ -502,4 +502,4 @@ static const struct { { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, }; -#endif /* FFMPEG_VORBIS_ENC_DATA_H */ +#endif /* AVCODEC_VORBIS_ENC_DATA_H */ diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index b8ec3630ee..9f8588db6e 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DATA_H -#define FFMPEG_VP3DATA_H +#ifndef AVCODEC_VP3DATA_H +#define AVCODEC_VP3DATA_H #include <stdint.h> #include <stdlib.h> @@ -3178,4 +3178,4 @@ static const uint16_t ac_bias_3[16][32][2] = { } }; -#endif /* FFMPEG_VP3DATA_H */ +#endif /* AVCODEC_VP3DATA_H */ diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 8167957ed5..991e94b554 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP56_H -#define FFMPEG_VP56_H +#ifndef AVCODEC_VP56_H +#define AVCODEC_VP56_H #include "vp56data.h" #include "dsputil.h" @@ -265,4 +265,4 @@ static inline int vp56_rac_get_tree(vp56_range_coder_t *c, return -tree->val; } -#endif /* FFMPEG_VP56_H */ +#endif /* AVCODEC_VP56_H */ diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index e9fe8bb684..95dc633dcd 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP56DATA_H -#define FFMPEG_VP56DATA_H +#ifndef AVCODEC_VP56DATA_H +#define AVCODEC_VP56DATA_H #include "libavutil/common.h" @@ -249,4 +249,4 @@ static const int8_t vp56_candidate_predictor_pos[12][2] = { { 2, -2 }, }; -#endif /* FFMPEG_VP56DATA_H */ +#endif /* AVCODEC_VP56DATA_H */ diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h index c08688a213..64ecb78b83 100644 --- a/libavcodec/vp5data.h +++ b/libavcodec/vp5data.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP5DATA_H -#define FFMPEG_VP5DATA_H +#ifndef AVCODEC_VP5DATA_H +#define AVCODEC_VP5DATA_H #include <stdint.h> @@ -172,4 +172,4 @@ static const int16_t vp5_ract_lc[3][3][5][6][2] = { static const uint8_t vp5_coord_div[] = { 2, 2, 2, 2, 4, 4 }; -#endif /* FFMPEG_VP5DATA_H */ +#endif /* AVCODEC_VP5DATA_H */ diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h index 8d4bb0b57f..31d6c98cdb 100644 --- a/libavcodec/vp6data.h +++ b/libavcodec/vp6data.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP6DATA_H -#define FFMPEG_VP6DATA_H +#ifndef AVCODEC_VP6DATA_H +#define AVCODEC_VP6DATA_H #include "vp56data.h" @@ -305,4 +305,4 @@ static const uint8_t vp6_huff_run_map[] = { 10, 13, 11, 12, 0, 1, 2, 3, 14, 8, 15, 16, 4, 5, 6, 7 }; -#endif /* FFMPEG_VP6DATA_H */ +#endif /* AVCODEC_VP6DATA_H */ diff --git a/libavcodec/wma.h b/libavcodec/wma.h index 43b5d0c339..0aa109c857 100644 --- a/libavcodec/wma.h +++ b/libavcodec/wma.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_WMA_H -#define FFMPEG_WMA_H +#ifndef AVCODEC_WMA_H +#define AVCODEC_WMA_H #include "bitstream.h" #include "dsputil.h" @@ -146,4 +146,4 @@ int ff_wma_init(AVCodecContext * avctx, int flags2); int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); -#endif /* FFMPEG_WMA_H */ +#endif /* AVCODEC_WMA_H */ diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h index aa2a120a2b..fbe66eaca5 100644 --- a/libavcodec/wmadata.h +++ b/libavcodec/wmadata.h @@ -24,8 +24,8 @@ * Various WMA tables. */ -#ifndef FFMPEG_WMADATA_H -#define FFMPEG_WMADATA_H +#ifndef AVCODEC_WMADATA_H +#define AVCODEC_WMADATA_H #include <stdint.h> #include "wma.h" @@ -1438,4 +1438,4 @@ static const CoefVLCTable coef_vlcs[6] = { }, }; -#endif /* FFMPEG_WMADATA_H */ +#endif /* AVCODEC_WMADATA_H */ diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index 9d43ec547e..7ed96ced7a 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_WMV2_H -#define FFMPEG_WMV2_H +#ifndef AVCODEC_WMV2_H +#define AVCODEC_WMV2_H #include "avcodec.h" #include "dsputil.h" @@ -55,4 +55,4 @@ typedef struct Wmv2Context{ void ff_wmv2_common_init(Wmv2Context * w); -#endif /* FFMPEG_WMV2_H */ +#endif /* AVCODEC_WMV2_H */ diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h index 0a6b33530e..60f4a95d1c 100644 --- a/libavcodec/xiph.h +++ b/libavcodec/xiph.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_XIPH_H -#define FFMPEG_XIPH_H +#ifndef AVCODEC_XIPH_H +#define AVCODEC_XIPH_H #include "libavutil/common.h" @@ -40,4 +40,4 @@ int ff_split_xiph_headers(uint8_t *extradata, int extradata_size, int first_header_size, uint8_t *header_start[3], int header_len[3]); -#endif /* FFMPEG_XIPH_H */ +#endif /* AVCODEC_XIPH_H */ diff --git a/libavcodec/xvmc_render.h b/libavcodec/xvmc_render.h index 10fd56ffaa..8db435784b 100644 --- a/libavcodec/xvmc_render.h +++ b/libavcodec/xvmc_render.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_XVMC_RENDER_H -#define FFMPEG_XVMC_RENDER_H +#ifndef AVCODEC_XVMC_RENDER_H +#define AVCODEC_XVMC_RENDER_H #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -72,4 +72,4 @@ typedef struct{ } xvmc_render_state_t; -#endif /* FFMPEG_XVMC_RENDER_H */ +#endif /* AVCODEC_XVMC_RENDER_H */ |