Commit 98790382 authored by Stefano Sabatini's avatar Stefano Sabatini

Globally rename the header inclusion guard names.

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

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f0319383
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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,