Add FFMPEG_ prefix to all multiple inclusion guards.

Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk

cmdutils.h

@@ -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 */

ffserver.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 */

libavcodec/aac_ac3_parser.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 */

libavcodec/ac3.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 */

libavcodec/ac3_parser.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 */

libavcodec/ac3tab.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 */

libavcodec/alpha/asm.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 */

libavcodec/alpha/regdef.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 */

libavcodec/armv4l/mathops.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 */

libavcodec/atrac3data.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 */

libavcodec/avcodec.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 */

libavcodec/bethsoftvideo.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 */

libavcodec/bfin/dsputil_bfin.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 */

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 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 */

libavcodec/bitstream.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 */

libavcodec/bmp.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 */

libavcodec/cabac.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 */

libavcodec/cavs.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 */

libavcodec/cavsdata.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 */

libavcodec/cookdata.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 */

libavcodec/dca.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DCA_H
-#define AVCODEC_DCA_H
+#ifndef FFMPEG_DCA_H
+#define FFMPEG_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 // AVCODEC_DCA_H
+#endif /* FFMPEG_DCA_H */

libavcodec/dcadata.h

@@ -24,8 +24,8 @@
  * @file dcadata.c
  */
 
-#ifndef AVCODEC_DCADATA_H
-#define AVCODEC_DCADATA_H
+#ifndef FFMPEG_DCADATA_H
+#define FFMPEG_DCADATA_H
 
 #include <stdint.h>
 
@@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel.
 
 */
 
-#endif // AVCODEC_DCADATA_H
+#endif /* FFMPEG_DCADATA_H */

libavcodec/dcahuff.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DCAHUFF_H
-#define AVCODEC_DCAHUFF_H
+#ifndef FFMPEG_DCAHUFF_H
+#define FFMPEG_DCAHUFF_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -1073,4 +1073,4 @@ static const uint8_t* bitalloc_bits[10][8] = {
     bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };
 
-#endif // AVCODEC_DCAHUFF_H
+#endif /* FFMPEG_DCAHUFF_H */

libavcodec/dnxhddata.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_DNXHDDATA_H
-#define AVCODEC_DNXHDDATA_H
+#ifndef FFMPEG_DNXHDDATA_H
+#define FFMPEG_DNXHDDATA_H
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ extern const CIDEntry ff_dnxhd_cid_table[];
 
 int ff_dnxhd_get_cid_table(int cid);
 
-#endif  // AVCODEC_DNXHDDATA_H
+#endif /* FFMPEG_DNXHDDATA_H */

libavcodec/dsputil.h

@@ -27,8 +27,8 @@
  * absolutely necessary to call emms_c() between dsp & float/double code
  */
 
-#ifndef DSPUTIL_H
-#define DSPUTIL_H
+#ifndef FFMPEG_DSPUTIL_H
+#define FFMPEG_DSPUTIL_H
 
 #include "avcodec.h"
 
@@ -743,4 +743,4 @@ static inline void copy_block17(uint8_t *dst, uint8_t *src, int dstStride, int s
     }
 }
 
-#endif
+#endif /* FFMPEG_DSPUTIL_H */

libavcodec/dvdata.h

@@ -24,8 +24,8 @@
  * Constants for DV codec.
  */
 
-#ifndef AVCODEC_DVDATA_H
-#define AVCODEC_DVDATA_H
+#ifndef FFMPEG_DVDATA_H
+#define FFMPEG_DVDATA_H
 
 #include "avcodec.h"
 #include "rational.h"
@@ -2729,4 +2729,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
     return 3;
 }
 
-#endif // AVCODEC_DVDATA_H
+#endif /* FFMPEG_DVDATA_H */

libavcodec/elbg.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_ELBG_H
-#define AVCODEC_ELBG_H
+#ifndef FFMPEG_ELBG_H
+#define FFMPEG_ELBG_H
 
 #include "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 // AVCODEC_ELBG_H
+#endif /* FFMPEG_ELBG_H */

libavcodec/eval.h

@@ -25,8 +25,8 @@
  * eval header.
  */
 
-#ifndef AVCODEC_EVAL_H
-#define AVCODEC_EVAL_H
+#ifndef FFMPEG_EVAL_H
+#define FFMPEG_EVAL_H
 
 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 /**
@@ -84,4 +84,4 @@ AVEvalExpr * ff_parse(char *s, const char **const_name,
 double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque);
 void ff_eval_free(AVEvalExpr * e);
 
-#endif /* AVCODEC_EVAL_H */
+#endif /* FFMPEG_EVAL_H */

libavcodec/faandct.h

@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_FAANDCT_H
-#define AVCODEC_FAANDCT_H
+#ifndef FFMPEG_FAANDCT_H
+#define FFMPEG_FAANDCT_H
 
 #include "dsputil.h"
 
@@ -36,4 +36,4 @@
 void ff_faandct(DCTELEM * data);
 void ff_faandct248(DCTELEM * data);
 
-#endif // AVCODEC_FAANDCT_H
+#endif /* FFMPEG_FAANDCT_H */

libavcodec/golomb.h

@@ -27,8 +27,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
  */
 
-#ifndef AVCODEC_GOLOMB_H
-#define AVCODEC_GOLOMB_H
+#ifndef FFMPEG_GOLOMB_H
+#define FFMPEG_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 // AVCODEC_GOLOMB_H
+#endif /* FFMPEG_GOLOMB_H */

libavcodec/h261.h

@@ -25,8 +25,8 @@
  * h261codec.
  */
 
-#ifndef AVCODEC_H261_H
-#define AVCODEC_H261_H
+#ifndef FFMPEG_H261_H
+#define FFMPEG_H261_H
 
 #include "mpegvideo.h"
 
@@ -48,4 +48,4 @@ typedef struct H261Context{
 
 #define MB_TYPE_H261_FIL 0x800000
 
-#endif /* AVCODEC_H261_H */
+#endif /* FFMPEG_H261_H */

libavcodec/h261data.h

@@ -24,8 +24,8 @@
  * H.261 tables.
  */
 
-#ifndef AVCODEC_H261DATA_H
-#define AVCODEC_H261DATA_H
+#ifndef FFMPEG_H261DATA_H
+#define FFMPEG_H261DATA_H
 
 #include <stdint.h>
 #include "h261.h"
@@ -161,4 +161,4 @@ static RLTable h261_rl_tcoeff = {
     h261_tcoeff_level,
 };
 
-#endif // AVCODEC_H261DATA_H
+#endif /* FFMPEG_H261DATA_H */

libavcodec/h263.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H263_H
-#define AVCODEC_H263_H
+#ifndef FFMPEG_H263_H
+#define FFMPEG_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 /* AVCODEC_H263_H */
+#endif /* FFMPEG_H263_H */

libavcodec/h263_parser.h

@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_H263_PARSER_H
-#define AVCODEC_H263_PARSER_H
+#ifndef FFMPEG_H263_PARSER_H
+#define FFMPEG_H263_PARSER_H
 
 #include "parser.h"
 
 int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
 
-#endif // AVCODEC_H263_PARSER_H
+#endif /* FFMPEG_H263_PARSER_H */

libavcodec/h263data.h

@@ -26,8 +26,8 @@
  * H.263 tables.
  */
 
-#ifndef AVCODEC_H263DATA_H
-#define AVCODEC_H263DATA_H
+#ifndef FFMPEG_H263DATA_H
+#define FFMPEG_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 // AVCODEC_H263DATA_H
+#endif /* FFMPEG_H263DATA_H */

libavcodec/h264.h

@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264_H
-#define H264_H
+#ifndef FFMPEG_H264_H
+#define FFMPEG_H264_H
 
 #include "dsputil.h"
 #include "cabac.h"
@@ -416,4 +416,4 @@ typedef struct H264Context{
 
 }H264Context;
 
-#endif /* H264_H */
+#endif /* FFMPEG_H264_H */

libavcodec/h264_parser.h

@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264_PARSER_H
-#define H264_PARSER_H
+#ifndef FFMPEG_H264_PARSER_H
+#define FFMPEG_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 /* H264_PARSER_H */
+#endif /* FFMPEG_H264_PARSER_H */

libavcodec/h264data.h

@@ -26,8 +26,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_H264DATA_H
-#define AVCODEC_H264DATA_H
+#ifndef FFMPEG_H264DATA_H
+#define FFMPEG_H264DATA_H
 
 #include <stdint.h>
 #include "mpegvideo.h"
@@ -1305,4 +1305,4 @@ static const int8_t cabac_context_init_PB[3][460][2] =
     }
 };
 
-#endif // AVCODEC_H264DATA_H
+#endif /* FFMPEG_H264DATA_H */

libavcodec/h264pred.h

@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef H264PRED_H
-#define H264PRED_H
+#ifndef FFMPEG_H264PRED_H
+#define FFMPEG_H264PRED_H
 
 #include "common.h"
 
@@ -73,4 +73,4 @@ typedef struct H264PredContext{
 
 void ff_h264_pred_init(H264PredContext *h, int codec_id);
 
-#endif /* H264PRED_H */
+#endif /* FFMPEG_H264PRED_H */

libavcodec/huffman.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_HUFFMAN_H
-#define AVCODEC_HUFFMAN_H
+#ifndef FFMPEG_HUFFMAN_H
+#define FFMPEG_HUFFMAN_H
 
 #include "avcodec.h"
 
@@ -35,4 +35,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 hnode_first);
 
-#endif /* AVCODEC_HUFFMAN_H */
+#endif /* FFMPEG_HUFFMAN_H */

libavcodec/i386/mathops.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_X86_MATHOPS_H
-#define AVCODEC_X86_MATHOPS_H
+#ifndef FFMPEG_I386_MATHOPS_H
+#define FFMPEG_I386_MATHOPS_H
 
 #ifdef FRAC_BITS
 #   define MULL(ra, rb) \
@@ -42,4 +42,4 @@
      asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
      rt; })
 
-#endif // AVCODEC_X86_MATHOPS_H
+#endif /* FFMPEG_I386_MATHOPS_H */

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 AVCODEC_I386MMX_H
-#define AVCODEC_I386MMX_H
+#ifndef FFMPEG_MMX_H
+#define FFMPEG_MMX_H
 
 /*
  * The type of an value that fits in an MMX register (note that long
@@ -280,4 +280,4 @@ typedef        union {
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)