Mercurial > libavcodec.hg
changeset 5830:1d83e9c34641 libavcodec
Add FFMPEG_ prefix to all multiple inclusion guards.
line wrap: on
line diff
--- a/aac_ac3_parser.h Wed Oct 17 09:34:48 2007 +0000 +++ b/aac_ac3_parser.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ 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 */
--- a/ac3.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ac3.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ int deltbae,int deltnseg, uint8_t *deltoffst, uint8_t *deltlen, uint8_t *deltba); -#endif /* AC3_H */ +#endif /* FFMPEG_AC3_H */
--- a/ac3_parser.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ac3_parser.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ */ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr); -#endif /* AC3_PARSER_H */ +#endif /* FFMPEG_AC3_PARSER_H */
--- a/ac3tab.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ac3tab.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 uint16_t ff_fgaintab[8]; extern const uint8_t ff_ac3_bndsz[50]; -#endif /* AC3TAB_H */ +#endif /* FFMPEG_AC3TAB_H */
--- a/alpha/asm.h Wed Oct 17 09:34:48 2007 +0000 +++ b/alpha/asm.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ #error "Unknown compiler!" #endif -#endif /* LIBAVCODEC_ALPHA_ASM_H */ +#endif /* FFMPEG_ASM_H */
--- a/alpha/regdef.h Wed Oct 17 09:34:48 2007 +0000 +++ b/alpha/regdef.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/armv4l/mathops.h Wed Oct 17 09:34:48 2007 +0000 +++ b/armv4l/mathops.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/atrac3data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/atrac3data.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ /* 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 */
--- a/avcodec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/avcodec.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ #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 */
--- a/bethsoftvideo.h Wed Oct 17 09:34:48 2007 +0000 +++ b/bethsoftvideo.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ EOF_BLOCK = 0x14, }; -#endif // AVCODEC_BETHSOFTVIDEO_H +#endif /* FFMPEG_BETHSOFTVIDEO_H */
--- a/bfin/dsputil_bfin.h Wed Oct 17 09:34:48 2007 +0000 +++ b/bfin/dsputil_bfin.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ #define bfprof() #endif -#endif +#endif /* FFMPEG_DSPUTIL_BFIN_H */
--- a/bfin/mathops.h Wed Oct 17 09:34:48 2007 +0000 +++ b/bfin/mathops.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/bitstream.h Wed Oct 17 09:34:48 2007 +0000 +++ b/bitstream.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ return get_bits1(gb) + 1; } -#endif /* BITSTREAM_H */ +#endif /* FFMPEG_BITSTREAM_H */
--- a/bmp.h Wed Oct 17 09:34:48 2007 +0000 +++ b/bmp.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ BMP_BITFIELDS =3, } BiCompression; -#endif // AVCODEC_BMP_H +#endif /* FFMPEG_BMP_H */
--- a/cabac.h Wed Oct 17 09:34:48 2007 +0000 +++ b/cabac.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ } #endif /* 0 */ -#endif /* CABAC_H */ +#endif /* FFMPEG_CABAC_H */
--- a/cavs.h Wed Oct 17 09:34:48 2007 +0000 +++ b/cavs.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ int ff_cavs_init(AVCodecContext *avctx); int ff_cavs_end (AVCodecContext *avctx); -#endif /* CAVS_H */ +#endif /* FFMPEG_CAVS_H */
--- a/cavsdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/cavsdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -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_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 */
--- a/cookdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/cookdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ cplscale2, cplscale3, cplscale4, cplscale5, cplscale6, }; -#endif // AVCODEC_COOKDATA_H +#endif /* FFMPEG_COOKDATA_H */
--- a/dca.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dca.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/dcadata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dcadata.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ */ -#endif // AVCODEC_DCADATA_H +#endif /* FFMPEG_DCADATA_H */
--- a/dcahuff.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dcahuff.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL } }; -#endif // AVCODEC_DCAHUFF_H +#endif /* FFMPEG_DCAHUFF_H */
--- a/dnxhddata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dnxhddata.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ int ff_dnxhd_get_cid_table(int cid); -#endif // AVCODEC_DNXHDDATA_H +#endif /* FFMPEG_DNXHDDATA_H */
--- a/dsputil.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dsputil.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ } } -#endif +#endif /* FFMPEG_DSPUTIL_H */
--- a/dvdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/dvdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ return 3; } -#endif // AVCODEC_DVDATA_H +#endif /* FFMPEG_DVDATA_H */
--- a/elbg.h Wed Oct 17 09:34:48 2007 +0000 +++ b/elbg.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ int numCB, int num_steps, int *closest_cb, AVRandomState *rand_state); -#endif // AVCODEC_ELBG_H +#endif /* FFMPEG_ELBG_H */
--- a/eval.h Wed Oct 17 09:34:48 2007 +0000 +++ b/eval.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ 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 */
--- a/faandct.h Wed Oct 17 09:34:48 2007 +0000 +++ b/faandct.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/golomb.h Wed Oct 17 09:34:48 2007 +0000 +++ b/golomb.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ set_ur_golomb_jpegls(pb, v, k, limit, esc_len); } -#endif // AVCODEC_GOLOMB_H +#endif /* FFMPEG_GOLOMB_H */
--- a/h261.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h261.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ #define MB_TYPE_H261_FIL 0x800000 -#endif /* AVCODEC_H261_H */ +#endif /* FFMPEG_H261_H */
--- a/h261data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h261data.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ h261_tcoeff_level, }; -#endif // AVCODEC_H261DATA_H +#endif /* FFMPEG_H261DATA_H */
--- a/h263.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h263.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/h263_parser.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h263_parser.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/h263data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h263data.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ 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 */
--- a/h264.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h264.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ }H264Context; -#endif /* H264_H */ +#endif /* FFMPEG_H264_H */
--- a/h264_parser.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h264_parser.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/h264data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h264data.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ } }; -#endif // AVCODEC_H264DATA_H +#endif /* FFMPEG_H264DATA_H */
--- a/h264pred.h Wed Oct 17 09:34:48 2007 +0000 +++ b/h264pred.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id); -#endif /* H264PRED_H */ +#endif /* FFMPEG_H264PRED_H */
--- a/huffman.h Wed Oct 17 09:34:48 2007 +0000 +++ b/huffman.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ 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 */
--- a/i386/mathops.h Wed Oct 17 09:34:48 2007 +0000 +++ b/i386/mathops.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 */
--- a/i386/mmx.h Wed Oct 17 09:34:48 2007 +0000 +++ b/i386/mmx.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 @@ #define punpckhqdq_r2r(regs,regd) mmx_r2r (punpckhqdq, regs, regd) -#endif /* AVCODEC_I386MMX_H */ +#endif /* FFMPEG_MMX_H */
--- a/i386/vp3dsp_mmx.h Wed Oct 17 09:34:48 2007 +0000 +++ b/i386/vp3dsp_mmx.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP3DSP_MMX_H -#define VP3DSP_MMX_H +#ifndef FFMPEG_VP3DSP_MMX_H +#define FFMPEG_VP3DSP_MMX_H #include "dsputil.h" @@ -29,4 +29,4 @@ void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_dsp_init_mmx(void); -#endif /* VP3DSP_MMX_H */ +#endif /* FFMPEG_VP3DSP_MMX_H */
--- a/i386/vp3dsp_sse2.h Wed Oct 17 09:34:48 2007 +0000 +++ b/i386/vp3dsp_sse2.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP3DSP_SSE2_H -#define VP3DSP_SSE2_H +#ifndef FFMPEG_VP3DSP_SSE2_H +#define FFMPEG_VP3DSP_SSE2_H #include "dsputil.h" @@ -28,4 +28,4 @@ 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 /* VP3DSP_SSE2_H */ +#endif /* FFMPEG_VP3DSP_SSE2_H */
--- a/imcdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/imcdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_IMCDATA_H -#define AVCODEC_IMCDATA_H +#ifndef FFMPEG_IMCDATA_H +#define FFMPEG_IMCDATA_H #include <stdint.h> @@ -166,4 +166,4 @@ } }; -#endif // AVCODEC_IMCDATA_H +#endif /* FFMPEG_IMCDATA_H */
--- a/indeo2data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/indeo2data.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_INDEO2DATA_H -#define AVCODEC_INDEO2DATA_H +#ifndef FFMPEG_INDEO2DATA_H +#define FFMPEG_INDEO2DATA_H #include <stdint.h> @@ -138,4 +138,4 @@ 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80 }; -#endif // AVCODEC_INDEO2DATA_H +#endif /* FFMPEG_INDEO2DATA_H */
--- a/indeo3data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/indeo3data.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_INDEO3DATA_H -#define AVCODEC_INDEO3DATA_H +#ifndef FFMPEG_INDEO3DATA_H +#define FFMPEG_INDEO3DATA_H #include <stdint.h> @@ -2339,4 +2339,4 @@ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; -#endif // AVCODEC_INDEO3DATA_H +#endif /* FFMPEG_INDEO3DATA_H */
--- a/jpegls.h Wed Oct 17 09:34:48 2007 +0000 +++ b/jpegls.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * JPEG-LS common code. */ -#ifndef JPEGLS_H -#define JPEGLS_H +#ifndef FFMPEG_JPEGLS_H +#define FFMPEG_JPEGLS_H #include "avcodec.h" @@ -108,4 +108,4 @@ #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 /* JPEGLS_H */ +#endif /* FFMPEG_JPEGLS_H */
--- a/jpeglsdec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/jpeglsdec.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * JPEG-LS decoder. */ -#ifndef JPEGLSDEC_H -#define JPEGLSDEC_H +#ifndef FFMPEG_JPEGLSDEC_H +#define FFMPEG_JPEGLSDEC_H #include "mjpeg.h" #include "mjpegdec.h" @@ -38,4 +38,4 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv); -#endif /* JPEGLSDEC_H */ +#endif /* FFMPEG_JPEGLSDEC_H */
--- a/lcl.h Wed Oct 17 09:34:48 2007 +0000 +++ b/lcl.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_LCL_H -#define AVCODEC_LCL_H +#ifndef FFMPEG_LCL_H +#define FFMPEG_LCL_H #define BMPTYPE_YUV 1 #define BMPTYPE_RGB 2 @@ -46,4 +46,4 @@ #define CODEC_MSZH 1 #define CODEC_ZLIB 3 -#endif /* AVCODEC_LCL_H */ +#endif /* FFMPEG_LCL_H */
--- a/libxvid_internal.h Wed Oct 17 09:34:48 2007 +0000 +++ b/libxvid_internal.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef LIBXVID_INTERNAL_H -#define LIBXVID_INTERNAL_H +#ifndef FFMPEG_LIBXVID_INTERNAL_H +#define FFMPEG_LIBXVID_INTERNAL_H /** * @file libxvid_internal.h @@ -29,4 +29,4 @@ int av_tempfile(char *prefix, char **filename); -#endif /* LIBXVID_INTERNAL_H */ +#endif /* FFMPEG_LIBXVID_INTERNAL_H */
--- a/lzw.h Wed Oct 17 09:34:48 2007 +0000 +++ b/lzw.h Wed Oct 17 09:37:46 2007 +0000 @@ -27,8 +27,8 @@ * Modified for use in TIFF by Konstantin Shishkov */ -#ifndef LZW_H -#define LZW_H +#ifndef FFMPEG_LZW_H +#define FFMPEG_LZW_H #include "bitstream.h" @@ -56,4 +56,4 @@ int ff_lzw_encode(struct LZWEncodeState * s, const uint8_t * inbuf, int insize); int ff_lzw_encode_flush(struct LZWEncodeState * s); -#endif +#endif /* FFMPEG_LZW_H */
--- a/mathops.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mathops.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 MATHOPS_H -#define MATHOPS_H +#ifndef FFMPEG_MATHOPS_H +#define FFMPEG_MATHOPS_H #include "common.h" @@ -71,5 +71,5 @@ # define MUL16(ra, rb) ((ra) * (rb)) #endif -#endif //MATHOPS_H +#endif /* FFMPEG_MATHOPS_H */
--- a/mjpeg.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mjpeg.h Wed Oct 17 09:37:46 2007 +0000 @@ -30,8 +30,8 @@ * MJPEG encoder and decoder. */ -#ifndef MJPEG_H -#define MJPEG_H +#ifndef FFMPEG_MJPEG_H +#define FFMPEG_MJPEG_H #include "avcodec.h" #include "bitstream.h" @@ -153,4 +153,4 @@ const uint8_t *bits_table, const uint8_t *val_table); -#endif /* MJPEG_H */ +#endif /* FFMPEG_MJPEG_H */
--- a/mjpegdec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mjpegdec.h Wed Oct 17 09:37:46 2007 +0000 @@ -26,8 +26,8 @@ * MJPEG decoder. */ -#ifndef MJPEGDEC_H -#define MJPEGDEC_H +#ifndef FFMPEG_MJPEGDEC_H +#define FFMPEG_MJPEGDEC_H #include "avcodec.h" #include "bitstream.h" @@ -109,4 +109,4 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s); int ff_mjpeg_decode_sos(MJpegDecodeContext *s); -#endif /* MJPEGDEC_H */ +#endif /* FFMPEG_MJPEGDEC_H */
--- a/mjpegenc.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mjpegenc.h Wed Oct 17 09:37:46 2007 +0000 @@ -30,8 +30,8 @@ * MJPEG encoder. */ -#ifndef MJPEGENC_H -#define MJPEGENC_H +#ifndef FFMPEG_MJPEGENC_H +#define FFMPEG_MJPEGENC_H #include "dsputil.h" #include "mpegvideo.h" @@ -57,4 +57,4 @@ uint8_t *huff_size, uint16_t *huff_code); void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]); -#endif /* MJPEGENC_H */ +#endif /* FFMPEG_MJPEGENC_H */
--- a/mpcdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpcdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_MPCDATA_H -#define AVCODEC_MPCDATA_H +#ifndef FFMPEG_MPCDATA_H +#define FFMPEG_MPCDATA_H #include <stdint.h> @@ -209,4 +209,4 @@ 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789 }; -#endif // AVCODEC_MPCDATA_H +#endif /* FFMPEG_MPCDATA_H */
--- a/mpeg12.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpeg12.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_MPEG12_H -#define AVCODEC_MPEG12_H +#ifndef FFMPEG_MPEG12_H +#define FFMPEG_MPEG12_H #include "mpegvideo.h" @@ -28,4 +28,4 @@ void ff_mpeg12_common_init(MpegEncContext *s); -#endif /* AVCODEC_MPEG12_H */ +#endif /* FFMPEG_MPEG12_H */
--- a/mpeg12data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpeg12data.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * MPEG1/2 tables. */ -#ifndef AVCODEC_MPEG12DATA_H -#define AVCODEC_MPEG12DATA_H +#ifndef FFMPEG_MPEG12DATA_H +#define FFMPEG_MPEG12DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -47,4 +47,4 @@ extern const float ff_mpeg1_aspect[16]; extern const AVRational ff_mpeg2_aspect[16]; -#endif // AVCODEC_MPEG12DATA_H +#endif /* FFMPEG_MPEG12DATA_H */
--- a/mpeg12decdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpeg12decdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * MPEG1/2 decoder tables. */ -#ifndef AVCODEC_MPEG12DECDATA_H -#define AVCODEC_MPEG12DECDATA_H +#ifndef FFMPEG_MPEG12DECDATA_H +#define FFMPEG_MPEG12DECDATA_H #include <stdint.h> #include "mpegvideo.h" @@ -121,4 +121,4 @@ mpeg2_dc_scale_table3, }; -#endif // AVCODEC_MPEG12DECDATA_H +#endif /* FFMPEG_MPEG12DECDATA_H */
--- a/mpeg4data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpeg4data.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * mpeg4 tables. */ -#ifndef AVCODEC_MPEG4DATA_H -#define AVCODEC_MPEG4DATA_H +#ifndef FFMPEG_MPEG4DATA_H +#define FFMPEG_MPEG4DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -429,4 +429,4 @@ 99, 13, 15, 17, 19, 21, 23, 0 }; -#endif // AVCODEC_MPEG4DATA_H +#endif /* FFMPEG_MPEG4DATA_H */
--- a/mpeg4video_parser.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpeg4video_parser.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MPEG4VIDEO_PARSER_H -#define MPEG4VIDEO_PARSER_H +#ifndef FFMPEG_MPEG4VIDEO_PARSER_H +#define FFMPEG_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 /* MPEG4VIDEO_PARSER_H */ +#endif /* FFMPEG_MPEG4VIDEO_PARSER_H */
--- a/mpegaudio.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegaudio.h Wed Oct 17 09:37:46 2007 +0000 @@ -23,8 +23,8 @@ * mpeg audio declarations for both encoder and decoder. */ -#ifndef MPEGAUDIO_H -#define MPEGAUDIO_H +#ifndef FFMPEG_MPEGAUDIO_H +#define FFMPEG_MPEGAUDIO_H #include "avcodec.h" #include "bitstream.h" @@ -152,4 +152,4 @@ return 0; } -#endif /* MPEGAUDIO_H */ +#endif /* FFMPEG_MPEGAUDIO_H */
--- a/mpegaudiodata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegaudiodata.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * mpeg audio layer common tables. */ -#ifndef MPEGAUDIODATA_H -#define MPEGAUDIODATA_H +#ifndef FFMPEG_MPEGAUDIODATA_H +#define FFMPEG_MPEGAUDIODATA_H #include "common.h" @@ -37,4 +37,4 @@ extern const int ff_mpa_quant_bits[17]; extern const unsigned char *ff_mpa_alloc_tables[5]; -#endif /* MPEGAUDIODATA_H */ +#endif /* FFMPEG_MPEGAUDIODATA_H */
--- a/mpegaudiodecheader.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegaudiodecheader.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * MPEG Audio header decoder. */ -#ifndef MPEGAUDIODECHEADER_H -#define MPEGAUDIODECHEADER_H +#ifndef FFMPEG_MPEGAUDIODECHEADER_H +#define FFMPEG_MPEGAUDIODECHEADER_H #include "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 /* MPEGAUDIODECHEADER_H */ +#endif /* FFMPEG_MPEGAUDIODECHEADER_H */
--- a/mpegaudiodectab.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegaudiodectab.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * mpeg audio layer decoder tables. */ -#ifndef AVCODEC_MPEGAUDIODECTAB_H -#define AVCODEC_MPEGAUDIODECTAB_H +#ifndef FFMPEG_MPEGAUDIODECTAB_H +#define FFMPEG_MPEGAUDIODECTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -603,4 +603,4 @@ -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037, }; -#endif // AVCODEC_MPEGAUDIODECTAB_H +#endif /* FFMPEG_MPEGAUDIODECTAB_H */
--- a/mpegaudiotab.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegaudiotab.h Wed Oct 17 09:37:46 2007 +0000 @@ -27,8 +27,8 @@ * Most of them come from the mpeg audio specification. */ -#ifndef AVCODEC_MPEGAUDIOTAB_H -#define AVCODEC_MPEGAUDIOTAB_H +#ifndef FFMPEG_MPEGAUDIOTAB_H +#define FFMPEG_MPEGAUDIOTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -115,4 +115,4 @@ static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 }; -#endif // AVCODEC_MPEGAUDIOTAB_H +#endif /* FFMPEG_MPEGAUDIOTAB_H */
--- a/mpegvideo.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegvideo.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * mpegvideo header. */ -#ifndef AVCODEC_MPEGVIDEO_H -#define AVCODEC_MPEGVIDEO_H +#ifndef FFMPEG_MPEGVIDEO_H +#define FFMPEG_MPEGVIDEO_H #include "dsputil.h" #include "bitstream.h" @@ -898,5 +898,5 @@ DCTELEM block[6][64], int motion_x, int motion_y); -#endif /* AVCODEC_MPEGVIDEO_H */ +#endif /* FFMPEG_MPEGVIDEO_H */
--- a/mpegvideo_common.h Wed Oct 17 09:34:48 2007 +0000 +++ b/mpegvideo_common.h Wed Oct 17 09:37:46 2007 +0000 @@ -27,8 +27,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ -#ifndef MPEGVIDEO_COMMON_H -#define MPEGVIDEO_COMMON_H +#ifndef FFMPEG_MPEGVIDEO_COMMON_H +#define FFMPEG_MPEGVIDEO_COMMON_H #include "avcodec.h" #include "dsputil.h" @@ -833,4 +833,4 @@ } } -#endif /* MPEGVIDEO_COMMON_H */ +#endif /* FFMPEG_MPEGVIDEO_COMMON_H */
--- a/msmpeg4.h Wed Oct 17 09:34:48 2007 +0000 +++ b/msmpeg4.h Wed Oct 17 09:37:46 2007 +0000 @@ -23,8 +23,8 @@ * @file msmpeg4.h */ -#ifndef MSMPEG4_H -#define MSMPEG4_H +#ifndef FFMPEG_MSMPEG4_H +#define FFMPEG_MSMPEG4_H #include "config.h" @@ -41,4 +41,4 @@ #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER) #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER) -#endif /* MSMPEG4_H */ +#endif /* FFMPEG_MSMPEG4_H */
--- a/msmpeg4data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/msmpeg4data.h Wed Oct 17 09:37:46 2007 +0000 @@ -27,8 +27,8 @@ * MSMPEG4 data tables. */ -#ifndef MSMPEG4DATA_H -#define MSMPEG4DATA_H +#ifndef FFMPEG_MSMPEG4DATA_H +#define FFMPEG_MSMPEG4DATA_H #include "common.h" #include "bitstream.h" @@ -97,4 +97,4 @@ extern const uint8_t wmv2_scantableA[64]; extern const uint8_t wmv2_scantableB[64]; -#endif /* MSMPEG4DATA_H */ +#endif /* FFMPEG_MSMPEG4DATA_H */
--- a/opt.h Wed Oct 17 09:34:48 2007 +0000 +++ b/opt.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVOPT_H -#define AVOPT_H +#ifndef FFMPEG_OPT_H +#define FFMPEG_OPT_H /** * @file opt.h @@ -84,4 +84,4 @@ void av_opt_set_defaults(void *s); void av_opt_set_defaults2(void *s, int mask, int flags); -#endif +#endif /* FFMPEG_OPT_H */
--- a/png.h Wed Oct 17 09:34:48 2007 +0000 +++ b/png.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_PNG_H -#define AVCODEC_PNG_H +#ifndef FFMPEG_PNG_H +#define FFMPEG_PNG_H #include <stdint.h> @@ -71,4 +71,4 @@ /* compute the row size of an interleaved pass */ extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width); -#endif +#endif /* FFMPEG_PNG_H */
--- a/pnm.h Wed Oct 17 09:34:48 2007 +0000 +++ b/pnm.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PNM_H -#define PNM_H +#ifndef FFMPEG_PNM_H +#define FFMPEG_PNM_H #include "avcodec.h" @@ -34,4 +34,4 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); -#endif /* PNM_H */ +#endif /* FFMPEG_PNM_H */
--- a/ppc/dsputil_altivec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/dsputil_altivec.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DSPUTIL_ALTIVEC_H -#define DSPUTIL_ALTIVEC_H +#ifndef FFMPEG_DSPUTIL_ALTIVEC_H +#define FFMPEG_DSPUTIL_ALTIVEC_H #include "dsputil_ppc.h" @@ -31,4 +31,4 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); -#endif /* DSPUTIL_ALTIVEC_H */ +#endif /* FFMPEG_DSPUTIL_ALTIVEC_H */
--- a/ppc/dsputil_ppc.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/dsputil_ppc.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DSPUTIL_PPC_H -#define DSPUTIL_PPC_H +#ifndef FFMPEG_DSPUTIL_PPC_H +#define FFMPEG_DSPUTIL_PPC_H #ifdef CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); @@ -152,4 +152,4 @@ #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) #endif /* CONFIG_POWERPC_PERF */ -#endif /* DSPUTIL_PPC_H */ +#endif /* FFMPEG_DSPUTIL_PPC_H */
--- a/ppc/gcc_fixes.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/gcc_fixes.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef GCC_FIXES_H -#define GCC_FIXES_H +#ifndef FFMPEG_GCC_FIXES_H +#define FFMPEG_GCC_FIXES_H #ifdef HAVE_ALTIVEC_H #include <altivec.h> @@ -97,4 +97,4 @@ #endif -#endif /* GCC_FIXES_H */ +#endif /* FFMPEG_GCC_FIXES_H */
--- a/ppc/imgresample_altivec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/imgresample_altivec.h Wed Oct 17 09:37:46 2007 +0000 @@ -16,9 +16,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef IMGRESAMPLE_ALTIVEC_H -#define IMGRESAMPLE_ALTIVEC_H +#ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H +#define FFMPEG_IMGRESAMPLE_ALTIVEC_H void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src, int wrap, int16_t *filter); -#endif /* IMGRESAMPLE_ALTIVEC_H */ +#endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */
--- a/ppc/mathops.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/mathops.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_PPC_MATHOPS_H -#define AVCODEC_PPC_MATHOPS_H +#ifndef FFMPEG_PPC_MATHOPS_H +#define FFMPEG_PPC_MATHOPS_H #if defined(ARCH_POWERPC_405) /* signed 16x16 -> 32 multiply add accumulate */ @@ -35,4 +35,4 @@ __rt; }) #endif -#endif // AVCODEC_PPC_MATHOPS_H +#endif /* FFMPEG_PPC_MATHOPS_H */
--- a/ppc/types_altivec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/types_altivec.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_TYPES_ALTIVEC_H -#define AVCODEC_TYPES_ALTIVEC_H +#ifndef FFMPEG_TYPES_ALTIVEC_H +#define FFMPEG_TYPES_ALTIVEC_H /*********************************************************************** * Vector types @@ -43,4 +43,4 @@ #define zero_u32v (vec_u32_t) zerov #define zero_s32v (vec_s32_t) zerov -#endif // AVCODEC_TYPES_ALTIVEC_H +#endif /* FFMPEG_TYPES_ALTIVEC_H */
--- a/ppc/util_altivec.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ppc/util_altivec.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Contains misc utility macros and inline functions */ -#ifndef UTIL_ALTIVEC_H -#define UTIL_ALTIVEC_H +#ifndef FFMPEG_UTIL_ALTIVEC_H +#define FFMPEG_UTIL_ALTIVEC_H // used to build registers permutation vectors (vcprm) // the 's' are for words in the _s_econd vector @@ -103,4 +103,4 @@ return vec_perm(first, second, mask); } -#endif /* UTIL_ALTIVEC_H */ +#endif /* FFMPEG_UTIL_ALTIVEC_H */
--- a/ps2/mmi.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ps2/mmi.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MMI_H -#define MMI_H +#ifndef FFMPEG_MMI_H +#define FFMPEG_MMI_H #define align16 __attribute__ ((aligned (16))) @@ -168,5 +168,4 @@ #define pextlb(rs, rt, rd) \ __asm__ __volatile__ ("pextlb " #rd ", " #rs ", " #rt ) -#endif - +#endif /* FFMPEG_MMI_H */
--- a/qdm2data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/qdm2data.h Wed Oct 17 09:37:46 2007 +0000 @@ -27,8 +27,8 @@ * Various QDM2 tables. */ -#ifndef QDM2DATA_H -#define QDM2DATA_H +#ifndef FFMPEG_QDM2DATA_H +#define FFMPEG_QDM2DATA_H #include <stdint.h> @@ -528,4 +528,4 @@ 0.138071194291115f,0.333333343267441f,0.60947573184967f,1.0f,0.0f, }; -#endif /* QDM2DATA_H */ +#endif /* FFMPEG_QDM2DATA_H */
--- a/ra144.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ra144.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RA144TABLES_H -#define RA144TABLES_H +#ifndef FFMPEG_RA144_H +#define FFMPEG_RA144_H /* 14.4 data tables */ static const unsigned short sqrt_table[4096]={ @@ -2425,4 +2425,4 @@ decodetable6,decodetable7,decodetable8,decodetable9,decodetable10, decodetable11}; -#endif /* RA144TABLES_H */ +#endif /* FFMPEG_RA144_H */
--- a/ra288.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ra288.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RA288TABLES_H -#define RA288TABLES_H +#ifndef FFMPEG_RA288_H +#define FFMPEG_RA288_H static const float amptable[8]={ 0.515625, 0.90234375, 1.57910156, 2.76342773, -0.515625,-0.90234375,-1.57910156,-2.76342773 }; @@ -202,4 +202,4 @@ 0.553955078, 0.50201416, 0.454956055, 0.41229248, 0.373657227 }; -#endif /* RA288TABLES_H */ +#endif /* FFMPEG_RA288_H */
--- a/rangecoder.h Wed Oct 17 09:34:48 2007 +0000 +++ b/rangecoder.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * Range coder. */ -#ifndef AVCODEC_RANGECODER_H -#define AVCODEC_RANGECODER_H +#ifndef FFMPEG_RANGECODER_H +#define FFMPEG_RANGECODER_H #include <stdint.h> #include <assert.h> @@ -138,4 +138,4 @@ #endif } -#endif // AVCODEC_RANGECODER_H +#endif /* FFMPEG_RANGECODER_H */
--- a/ratecontrol.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ratecontrol.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_RATECONTROL_H -#define AVCODEC_RATECONTROL_H +#ifndef FFMPEG_RATECONTROL_H +#define FFMPEG_RATECONTROL_H /** * @file ratecontrol.h @@ -101,5 +101,5 @@ void ff_xvid_rate_control_uninit(struct MpegEncContext *s); float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run); -#endif /* AVCODEC_RATECONTROL_H */ +#endif /* FFMPEG_RATECONTROL_H */
--- a/raw.h Wed Oct 17 09:34:48 2007 +0000 +++ b/raw.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * Raw Video Codec */ -#ifndef AVCODEC_RAW_H -#define AVCODEC_RAW_H +#ifndef FFMPEG_RAW_H +#define FFMPEG_RAW_H #include "avcodec.h" @@ -36,4 +36,4 @@ extern const PixelFormatTag ff_raw_pixelFormatTags[]; -#endif /* AVCODEC_RAW_H */ +#endif /* FFMPEG_RAW_H */
--- a/rl.h Wed Oct 17 09:34:48 2007 +0000 +++ b/rl.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * rl header. */ -#ifndef AVCODEC_RL_H -#define AVCODEC_RL_H +#ifndef FFMPEG_RL_H +#define FFMPEG_RL_H #include <stdint.h> #include "bitstream.h" @@ -64,4 +64,4 @@ return index + level - 1; } -#endif +#endif /* FFMPEG_RL_H */
--- a/rle.h Wed Oct 17 09:34:48 2007 +0000 +++ b/rle.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RLE_H -#define RLE_H +#ifndef FFMPEG_RLE_H +#define FFMPEG_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 /* RLE_H */ +#endif /* FFMPEG_RLE_H */
--- a/roqvideo.h Wed Oct 17 09:34:48 2007 +0000 +++ b/roqvideo.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ROQVIDEO_H -#define AVCODEC_ROQVIDEO_H +#ifndef FFMPEG_ROQVIDEO_H +#define FFMPEG_ROQVIDEO_H #include "avcodec.h" #include "dsputil.h" @@ -89,4 +89,4 @@ void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); -#endif // AVCODEC_ROQVIDEO_H +#endif /* FFMPEG_ROQVIDEO_H */
--- a/rtjpeg.h Wed Oct 17 09:34:48 2007 +0000 +++ b/rtjpeg.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTJPEG_H -#define RTJPEG_H +#ifndef FFMPEG_RTJPEG_H +#define FFMPEG_RTJPEG_H #include <stdint.h> #include <dsputil.h> @@ -39,4 +39,4 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, uint8_t *buf, int buf_size); -#endif +#endif /* FFMPEG_RTJPEG_H */
--- a/s3tc.h Wed Oct 17 09:34:48 2007 +0000 +++ b/s3tc.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FF_S3TC_H -#define FF_S3TC_H +#ifndef FFMPEG_S3TC_H +#define FFMPEG_S3TC_H #include <stdint.h> @@ -50,4 +50,4 @@ const unsigned int w, const unsigned int h, const unsigned int stride); -#endif +#endif /* FFMPEG_S3TC_H */
--- a/sgi.h Wed Oct 17 09:34:48 2007 +0000 +++ b/sgi.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SGI_H -#define SGI_H +#ifndef FFMPEG_SGI_H +#define FFMPEG_SGI_H /** * SGI image file signature @@ -33,5 +33,4 @@ #define SGI_RGB 3 #define SGI_RGBA 4 -#endif - +#endif /* FFMPEG_SGI_H */
--- a/simple_idct.h Wed Oct 17 09:34:48 2007 +0000 +++ b/simple_idct.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * simple idct header. */ -#ifndef AVCODEC_SIMPLE_IDCT_H -#define AVCODEC_SIMPLE_IDCT_H +#ifndef FFMPEG_SIMPLE_IDCT_H +#define FFMPEG_SIMPLE_IDCT_H #include <stdint.h> #include "dsputil.h" @@ -43,4 +43,4 @@ void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block); void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); -#endif // AVCODEC_SIMPLE_IDCT_H +#endif /* FFMPEG_SIMPLE_IDCT_H */
--- a/snow.h Wed Oct 17 09:34:48 2007 +0000 +++ b/snow.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SNOW_H -#define SNOW_H +#ifndef FFMPEG_SNOW_H +#define FFMPEG_SNOW_H #include "dsputil.h" @@ -171,4 +171,4 @@ } } -#endif +#endif /* FFMPEG_SNOW_H */
--- a/sp5x.h Wed Oct 17 09:34:48 2007 +0000 +++ b/sp5x.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SP5X_H -#define SP5X_H +#ifndef FFMPEG_SP5X_H +#define FFMPEG_SP5X_H #include <stdint.h> @@ -331,4 +331,4 @@ }; #endif -#endif /* SP5X_H */ +#endif /* FFMPEG_SP5X_H */
--- a/sparc/vis.h Wed Oct 17 09:34:48 2007 +0000 +++ b/sparc/vis.h Wed Oct 17 09:37:46 2007 +0000 @@ -40,8 +40,8 @@ * the assembler to keep the binary from becoming tainted. */ -#ifndef AVCODEC_VIS_H -#define AVCODEC_VIS_H +#ifndef FFMPEG_VIS_H +#define FFMPEG_VIS_H #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) @@ -329,4 +329,4 @@ #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) -#endif // AVCODEC_VIS_H +#endif /* FFMPEG_VIS_H */
--- a/svq1.h Wed Oct 17 09:34:48 2007 +0000 +++ b/svq1.h Wed Oct 17 09:37:46 2007 +0000 @@ -32,8 +32,8 @@ * http://www.pcisys.net/~melanson/codecs/ */ -#ifndef AVCODEC_SVQ1_H -#define AVCODEC_SVQ1_H +#ifndef FFMPEG_SVQ1_H +#define FFMPEG_SVQ1_H #include <stdint.h> @@ -58,4 +58,4 @@ extern svq1_frame_size_t ff_svq1_frame_size_table[8]; -#endif /* AVCODEC_SVQ1_H */ +#endif /* FFMPEG_SVQ1_H */
--- a/svq1_cb.h Wed Oct 17 09:34:48 2007 +0000 +++ b/svq1_cb.h Wed Oct 17 09:37:46 2007 +0000 @@ -28,8 +28,8 @@ * svq1 code books. */ -#ifndef AVCODEC_SVQ1_CB_H -#define AVCODEC_SVQ1_CB_H +#ifndef FFMPEG_SVQ1_CB_H +#define FFMPEG_SVQ1_CB_H #include <stdint.h> #include <stdlib.h> @@ -1520,4 +1520,4 @@ NULL, NULL, }; -#endif // AVCODEC_SVQ1_CB_H +#endif /* FFMPEG_SVQ1_CB_H */
--- a/svq1_vlc.h Wed Oct 17 09:34:48 2007 +0000 +++ b/svq1_vlc.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef SVQ1_VLC_H -#define SVQ1_VLC_H +#ifndef FFMPEG_SVQ1_VLC_H +#define FFMPEG_SVQ1_VLC_H #include <stdint.h> @@ -280,4 +280,4 @@ { 0x3, 22 }, { 0x2, 22 }, { 0x1, 22 }, { 0x0, 22 } }; -#endif +#endif /* FFMPEG_SVQ1_VLC_H */
--- a/svq1enc_cb.h Wed Oct 17 09:34:48 2007 +0000 +++ b/svq1enc_cb.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * svq1 code books. */ -#ifndef AVCODEC_SVQ1ENC_CB_H -#define AVCODEC_SVQ1ENC_CB_H +#ifndef FFMPEG_SVQ1ENC_CB_H +#define FFMPEG_SVQ1ENC_CB_H #include <stdint.h> @@ -93,4 +93,4 @@ } }; -#endif /* AVCODEC_SVQ1ENC_CB_H */ +#endif /* FFMPEG_SVQ1ENC_CB_H */
--- a/tiff.h Wed Oct 17 09:34:48 2007 +0000 +++ b/tiff.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * @file tiff.h * @author Konstantin Shishkov */ -#ifndef TIFF_H -#define TIFF_H +#ifndef FFMPEG_TIFF_H +#define FFMPEG_TIFF_H #include <stdint.h> @@ -83,4 +83,4 @@ 0, 1, 100, 2, 4, 8 }; -#endif /* TIFF_H */ +#endif /* FFMPEG_TIFF_H */
--- a/truemotion1data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/truemotion1data.h Wed Oct 17 09:37:46 2007 +0000 @@ -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 TRUEMOTION1DATA_H -#define TRUEMOTION1DATA_H +#ifndef FFMPEG_TRUEMOTION1DATA_H +#define FFMPEG_TRUEMOTION1DATA_H #include <stdint.h> #include <stdlib.h> @@ -829,4 +829,5 @@ }; static const uint8_t *tables[] = { pc_tbl2, pc_tbl3, pc_tbl4 }; -#endif + +#endif /* FFMPEG_TRUEMOTION1DATA_H */
--- a/truespeech_data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/truespeech_data.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef TRUESPEECH_DATA_H -#define TRUESPEECH_DATA_H +#ifndef FFMPEG_TRUESPEECH_DATA_H +#define FFMPEG_TRUESPEECH_DATA_H #include <stdint.h> @@ -156,4 +156,4 @@ static const int16_t ts_5F2[8] = { 0x6000, 0x4800, 0x3600, 0x2880, 0x1E60, 0x16C8, 0x1116, 0x0CD1 }; -#endif /* TRUESPEECH_DATA_H */ +#endif /* FFMPEG_TRUESPEECH_DATA_H */
--- a/ulti_cb.h Wed Oct 17 09:34:48 2007 +0000 +++ b/ulti_cb.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ULTI_CB_H -#define AVCODEC_ULTI_CB_H +#ifndef FFMPEG_ULTI_CB_H +#define FFMPEG_ULTI_CB_H static const unsigned char ulti_codebook[16384]={ 0x00, 0x01, 0x01, 0x02, @@ -4121,4 +4121,4 @@ 0x3D, 0x3E, 0x3E, 0x3F }; -#endif // AVCODEC_ULTI_CB_H +#endif /* FFMPEG_ULTI_CB_H */
--- a/unary.h Wed Oct 17 09:34:48 2007 +0000 +++ b/unary.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_UNARY_H -#define AVCODEC_UNARY_H +#ifndef FFMPEG_UNARY_H +#define FFMPEG_UNARY_H #include "bitstream.h" @@ -53,4 +53,4 @@ return get_unary(gb, 0, 9); } -#endif /* AVCODEC_UNARY_H */ +#endif /* FFMPEG_UNARY_H */
--- a/vc1.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vc1.h Wed Oct 17 09:37:46 2007 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VC1_H -#define AVCODEC_VC1_H +#ifndef FFMPEG_VC1_H +#define FFMPEG_VC1_H #include "avcodec.h" #include "mpegvideo.h" @@ -304,4 +304,4 @@ int bi_type; } VC1Context; -#endif // AVCODEC_VC1_H +#endif /* FFMPEG_VC1_H */
--- a/vc1acdata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vc1acdata.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VC1ACDATA_H -#define AVCODEC_VC1ACDATA_H +#ifndef FFMPEG_VC1ACDATA_H +#define FFMPEG_VC1ACDATA_H #include <stdint.h> @@ -589,4 +589,4 @@ } }; -#endif // AVCODEC_VC1ACDATA_H +#endif /* FFMPEG_VC1ACDATA_H */
--- a/vc1data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vc1data.h Wed Oct 17 09:37:46 2007 +0000 @@ -25,8 +25,8 @@ * VC-1 tables. */ -#ifndef VC1DATA_H -#define VC1DATA_H +#ifndef FFMPEG_VC1DATA_H +#define FFMPEG_VC1DATA_H #include <stdint.h> #include "bitstream.h" @@ -160,4 +160,4 @@ /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */ extern const int32_t ff_vc1_dqscale[63]; -#endif /* VC1DATA_H */ +#endif /* FFMPEG_VC1DATA_H */
--- a/vorbis.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vorbis.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VORBIS_H -#define VORBIS_H +#ifndef FFMPEG_VORBIS_H +#define FFMPEG_VORBIS_H #include "avcodec.h" @@ -40,4 +40,4 @@ #define ilog(i) av_log2(2*(i)) -#endif +#endif /* FFMPEG_VORBIS_H */
--- a/vorbis_enc_data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vorbis_enc_data.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_VORBIS_ENC_DATA_H -#define AVCODEC_VORBIS_ENC_DATA_H +#ifndef FFMPEG_VORBIS_ENC_DATA_H +#define FFMPEG_VORBIS_ENC_DATA_H #include <stdint.h> @@ -502,4 +502,4 @@ { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, }; -#endif // AVCODEC_VORBIS_ENC_DATA_H +#endif /* FFMPEG_VORBIS_ENC_DATA_H */
--- a/vp3data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vp3data.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP3DATA_H -#define VP3DATA_H +#ifndef FFMPEG_VP3DATA_H +#define FFMPEG_VP3DATA_H #include <stdint.h> #include <stdlib.h> @@ -3178,4 +3178,4 @@ } }; -#endif /* VP3DATA_H */ +#endif /* FFMPEG_VP3DATA_H */
--- a/vp56.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vp56.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP56_H -#define VP56_H +#ifndef FFMPEG_VP56_H +#define FFMPEG_VP56_H #include "vp56data.h" #include "dsputil.h" @@ -265,4 +265,4 @@ return -tree->val; } -#endif /* VP56_H */ +#endif /* FFMPEG_VP56_H */
--- a/vp56data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vp56data.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP56DATA_H -#define VP56DATA_H +#ifndef FFMPEG_VP56DATA_H +#define FFMPEG_VP56DATA_H #include "common.h" @@ -248,4 +248,4 @@ { 2, -2 }, }; -#endif /* VP56DATA */ +#endif /* FFMPEG_VP56DATA_H */
--- a/vp5data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vp5data.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP5DATA_H -#define VP5DATA_H +#ifndef FFMPEG_VP5DATA_H +#define FFMPEG_VP5DATA_H #include <stdint.h> @@ -172,4 +172,4 @@ static const uint8_t vp5_coord_div[] = { 2, 2, 2, 2, 4, 4 }; -#endif /* VP5DATA_H */ +#endif /* FFMPEG_VP5DATA_H */
--- a/vp6data.h Wed Oct 17 09:34:48 2007 +0000 +++ b/vp6data.h Wed Oct 17 09:37:46 2007 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VP6DATA_H -#define VP6DATA_H +#ifndef FFMPEG_VP6DATA_H +#define FFMPEG_VP6DATA_H #include "vp56data.h" @@ -305,4 +305,4 @@ 10, 13, 11, 12, 0, 1, 2, 3, 14, 8, 15, 16, 4, 5, 6, 7 }; -#endif /* VP6DATA_H */ +#endif /* FFMPEG_VP6DATA_H */
--- a/wma.h Wed Oct 17 09:34:48 2007 +0000 +++ b/wma.h Wed Oct 17 09:37:46 2007 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef WMA_H -#define WMA_H +#ifndef FFMPEG_WMA_H +#define FFMPEG_WMA_H #include "bitstream.h" #include "dsputil.h" @@ -147,4 +147,4 @@ int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); -#endif +#endif /* FFMPEG_WMA_H */
--- a/wmadata.h Wed Oct 17 09:34:48 2007 +0000 +++ b/wmadata.h Wed Oct 17 09:37:46 2007 +0000 @@ -24,8 +24,8 @@ * Various WMA tables. */ -#ifndef AVCODEC_WMADATA_H -#define AVCODEC_WMADATA_H +#ifndef FFMPEG_WMADATA_H +#define FFMPEG_WMADATA_H #include <stdint.h> #include "wma.h" @@ -1438,4 +1438,4 @@ }, }; -#endif // AVCODEC_WMADATA_H +#endif /* FFMPEG_WMADATA_H */
--- a/xiph.h Wed Oct 17 09:34:48 2007 +0000 +++ b/xiph.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_XIPH_H -#define AVCODEC_XIPH_H +#ifndef FFMPEG_XIPH_H +#define FFMPEG_XIPH_H #include "common.h" @@ -40,4 +40,4 @@ int first_header_size, uint8_t *header_start[3], int header_len[3]); -#endif // AVCODEC_XIPH_H +#endif /* FFMPEG_XIPH_H */
--- a/xvmc_render.h Wed Oct 17 09:34:48 2007 +0000 +++ b/xvmc_render.h Wed Oct 17 09:37:46 2007 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_XVMC_RENDER_H -#define AVCODEC_XVMC_RENDER_H +#ifndef FFMPEG_XVMC_RENDER_H +#define FFMPEG_XVMC_RENDER_H #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -72,4 +72,4 @@ } xvmc_render_state_t; -#endif // AVCODEC_XVMC_RENDER_H +#endif /* FFMPEG_XVMC_RENDER_H */