Commit 5b21bdab authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Add FFMPEG_ prefix to all multiple inclusion guards.

Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 6a03549e
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef CMDUTILS_H
#define CMDUTILS_H
#ifndef FFMPEG_CMDUTILS_H
#define FFMPEG_CMDUTILS_H
typedef struct {
const char *name;
......@@ -87,4 +87,4 @@ void show_version(const char *program_name);
*/
void show_license(void);
#endif /* CMDUTILS_H */
#endif /* FFMPEG_CMDUTILS_H */
......@@ -18,11 +18,11 @@
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef FFSERVER_H
#define FFSERVER_H
#ifndef FFMPEG_FFSERVER_H
#define FFMPEG_FFSERVER_H
/* interface between ffserver and modules */
void ffserver_module_init(void);
#endif
#endif /* FFMPEG_FFSERVER_H */
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AAC_AC3_PARSER_H
#define AAC_AC3_PARSER_H
#ifndef FFMPEG_AAC_AC3_PARSER_H
#define FFMPEG_AAC_AC3_PARSER_H
#include <stdint.h>
#include "avcodec.h"
......@@ -40,4 +40,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size);
#endif /* AAC_AC3_PARSER_H */
#endif /* FFMPEG_AAC_AC3_PARSER_H */
......@@ -24,8 +24,8 @@
* Common code between AC3 encoder and decoder.
*/
#ifndef AC3_H
#define AC3_H
#ifndef FFMPEG_AC3_H
#define FFMPEG_AC3_H
#include "ac3tab.h"
......@@ -172,4 +172,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
int deltbae,int deltnseg,
uint8_t *deltoffst, uint8_t *deltlen, uint8_t *deltba);
#endif /* AC3_H */
#endif /* FFMPEG_AC3_H */
......@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AC3_PARSER_H
#define AC3_PARSER_H
#ifndef FFMPEG_AC3_PARSER_H
#define FFMPEG_AC3_PARSER_H
#include "ac3.h"
......@@ -44,4 +44,4 @@ typedef enum {
*/
int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
#endif /* AC3_PARSER_H */
#endif /* FFMPEG_AC3_PARSER_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AC3TAB_H
#define AC3TAB_H
#ifndef FFMPEG_AC3TAB_H
#define FFMPEG_AC3TAB_H
#include "common.h"
......@@ -40,4 +40,4 @@ extern const int16_t ff_floortab[8];
extern const uint16_t ff_fgaintab[8];
extern const uint8_t ff_ac3_bndsz[50];
#endif /* AC3TAB_H */
#endif /* FFMPEG_AC3TAB_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef LIBAVCODEC_ALPHA_ASM_H
#define LIBAVCODEC_ALPHA_ASM_H
#ifndef FFMPEG_ASM_H
#define FFMPEG_ASM_H
#include <inttypes.h>
......@@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
#error "Unknown compiler!"
#endif
#endif /* LIBAVCODEC_ALPHA_ASM_H */
#endif /* FFMPEG_ASM_H */
......@@ -20,8 +20,8 @@
*/
/* Some BSDs don't seem to have regdef.h... sigh */
#ifndef alpha_regdef_h
#define alpha_regdef_h
#ifndef FFMPEG_REGDEF_H
#define FFMPEG_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 /* alpha_regdef_h */
#endif /* FFMPEG_REGDEF_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_ARM_MATHOPS_H
#define AVCODEC_ARM_MATHOPS_H
#ifndef FFMPEG_ARMV4L_MATHOPS_H
#define FFMPEG_ARMV4L_MATHOPS_H
#ifdef FRAC_BITS
# define MULL(a, b) \
......@@ -51,4 +51,4 @@
#endif
#endif // AVCODEC_ARM_MATHOPS_H
#endif /* FFMPEG_ARMV4L_MATHOPS_H */
......@@ -25,8 +25,8 @@
* Atrac 3 AKA RealAudio 8 compatible decoder data
*/
#ifndef AVCODEC_ATRAC3DATA_H
#define AVCODEC_ATRAC3DATA_H
#ifndef FFMPEG_ATRAC3DATA_H
#define FFMPEG_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 // AVCODEC_ATRAC3DATA_H
#endif /* FFMPEG_ATRAC3DATA_H */
......@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_H
#define AVCODEC_H
#ifndef FFMPEG_AVCODEC_H
#define FFMPEG_AVCODEC_H
/**
* @file avcodec.h
......@@ -2933,4 +2933,4 @@ int av_parse_video_frame_rate(AVRational *frame_rate, const char *str);
#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 /* AVCODEC_H */
#endif /* FFMPEG_AVCODEC_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_BETHSOFTVIDEO_H
#define AVCODEC_BETHSOFTVIDEO_H
#ifndef FFMPEG_BETHSOFTVIDEO_H
#define FFMPEG_BETHSOFTVIDEO_H
enum BethsoftVidBlockType
{
......@@ -33,4 +33,4 @@ enum BethsoftVidBlockType
EOF_BLOCK = 0x14,
};
#endif // AVCODEC_BETHSOFTVIDEO_H
#endif /* FFMPEG_BETHSOFTVIDEO_H */
......@@ -21,8 +21,8 @@
*/
#ifndef DSPUTIL_BFIN_H
#define DSPUTIL_BFIN_H
#ifndef FFMPEG_DSPUTIL_BFIN_H
#define FFMPEG_DSPUTIL_BFIN_H
#define attribute_l1_text __attribute__ ((l1_text))
......@@ -65,4 +65,4 @@ static void bfprof (void)
#define bfprof()
#endif
#endif
#endif /* FFMPEG_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 AVCODEC_BFIN_MATHOPS_H
#define AVCODEC_BFIN_MATHOPS_H
#ifndef FFMPEG_BFIN_MATHOPS_H
#define FFMPEG_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 /* AVCODEC_BFIN_MATHOPS_H */
#endif /* FFMPEG_BFIN_MATHOPS_H */
......@@ -23,8 +23,8 @@
* bitstream api header.
*/
#ifndef BITSTREAM_H
#define BITSTREAM_H
#ifndef FFMPEG_BITSTREAM_H
#define FFMPEG_BITSTREAM_H
#include <stdint.h>
#include <stdlib.h>
......@@ -950,4 +950,4 @@ static inline int decode012(GetBitContext *gb){
return get_bits1(gb) + 1;
}
#endif /* BITSTREAM_H */
#endif /* FFMPEG_BITSTREAM_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_BMP_H
#define AVCODEC_BMP_H
#ifndef FFMPEG_BMP_H
#define FFMPEG_BMP_H
#include "avcodec.h"
......@@ -35,4 +35,4 @@ typedef enum {
BMP_BITFIELDS =3,
} BiCompression;
#endif // AVCODEC_BMP_H
#endif /* FFMPEG_BMP_H */
......@@ -24,8 +24,8 @@
* Context Adaptive Binary Arithmetic Coder.
*/
#ifndef CABAC_H
#define CABAC_H
#ifndef FFMPEG_CABAC_H
#define FFMPEG_CABAC_H
#include "bitstream.h"
......@@ -867,4 +867,4 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
}
#endif /* 0 */
#endif /* CABAC_H */
#endif /* FFMPEG_CABAC_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef CAVS_H
#define CAVS_H
#ifndef FFMPEG_CAVS_H
#define FFMPEG_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 /* CAVS_H */
#endif /* FFMPEG_CAVS_H */
......@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_CAVSDATA_H
#define AVCODEC_CAVSDATA_H
#ifndef FFMPEG_CAVSDATA_H
#define FFMPEG_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 // AVCODEC_CAVSDATA_H
#endif /* FFMPEG_CAVSDATA_H */
......@@ -25,8 +25,8 @@
* Cook AKA RealAudio G2 compatible decoderdata
*/
#ifndef AVCODEC_COOKDATA_H
#define AVCODEC_COOKDATA_H
#ifndef FFMPEG_COOKDATA_H
#define FFMPEG_COOKDATA_H
#include <stdint.h>
......@@ -562,4 +562,4 @@ static const float* cplscales[5] = {
cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
};
#endif // AVCODEC_COOKDATA_H
#endif /* FFMPEG_COOKDATA_H */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment