Mercurial > libavcodec.hg
changeset 7760:c4a4495715dd libavcodec
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_".
line wrap: on
line diff
--- a/aac.h Sun Aug 31 07:05:55 2008 +0000 +++ b/aac.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ } AACContext; -#endif /* FFMPEG_AAC_H */ +#endif /* AVCODEC_AAC_H */
--- a/aac_ac3_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/aac_ac3_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ 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 */
--- a/aacdectab.h Sun Aug 31 07:05:55 2008 +0000 +++ b/aacdectab.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ }; // @} -#endif /* FFMPEG_AACDECTAB_H */ +#endif /* AVCODEC_AACDECTAB_H */
--- a/aacpsy.h Sun Aug 31 07:05:55 2008 +0000 +++ b/aacpsy.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ */ void ff_aac_psy_end(AACPsyContext *ctx); -#endif /* FFMPEG_AACPSY_H */ +#endif /* AVCODEC_AACPSY_H */
--- a/aactab.h Sun Aug 31 07:05:55 2008 +0000 +++ b/aactab.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 float ff_aac_pow2sf_tab[316]; #endif /* CONFIG_HARDCODED_TABLES */ -#endif /* FFMPEG_AACTAB_H */ +#endif /* AVCODEC_AACTAB_H */
--- a/ac3.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ac3.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ uint8_t *dba_offsets, uint8_t *dba_lengths, uint8_t *dba_values); -#endif /* FFMPEG_AC3_H */ +#endif /* AVCODEC_AC3_H */
--- a/ac3_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ac3_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -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_full(GetBitContext *gbc, AC3HeaderInfo *hdr); -#endif /* FFMPEG_AC3_PARSER_H */ +#endif /* AVCODEC_AC3_PARSER_H */
--- a/ac3dec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ac3dec.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ */ void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch); -#endif /* FFMPEG_AC3DEC_H */ +#endif /* AVCODEC_AC3DEC_H */
--- a/ac3dec_data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ac3dec_data.h Sun Aug 31 07:39:47 2008 +0000 @@ -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_ac3_rematrix_band_tab[5]; -#endif /* FFMPEG_AC3DEC_DATA_H */ +#endif /* AVCODEC_AC3DEC_DATA_H */
--- a/ac3tab.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ac3tab.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ AC3_CHMAP_LFE = 1<<(15-15) }; -#endif /* FFMPEG_AC3TAB_H */ +#endif /* AVCODEC_AC3TAB_H */
--- a/acelp_filters.h Sun Aug 31 07:05:55 2008 +0000 +++ b/acelp_filters.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ const int16_t* in, int length); -#endif /* FFMPEG_ACELP_FILTERS_H */ +#endif /* AVCODEC_ACELP_FILTERS_H */
--- a/acelp_math.h Sun Aug 31 07:05:55 2008 +0000 +++ b/acelp_math.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ else return value << offset; } -#endif /* FFMPEG_ACELP_MATH_H */ +#endif /* AVCODEC_ACELP_MATH_H */
--- a/acelp_pitch_delay.h Sun Aug 31 07:05:55 2008 +0000 +++ b/acelp_pitch_delay.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ int subframe_size, int max_pred_order); -#endif /* FFMPEG_ACELP_PITCH_DELAY_H */ +#endif /* AVCODEC_ACELP_PITCH_DELAY_H */
--- a/acelp_vectors.h Sun Aug 31 07:05:55 2008 +0000 +++ b/acelp_vectors.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ int shift, int length); -#endif /* FFMPEG_ACELP_VECTORS_H */ +#endif /* AVCODEC_ACELP_VECTORS_H */
--- a/adx.h Sun Aug 31 07:05:55 2008 +0000 +++ b/adx.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ #define SCALE1 0x7298 #define SCALE2 0x3350 -#endif /* FFMPEG_ADX_H */ +#endif /* AVCODEC_ADX_H */
--- a/alpha/asm.h Sun Aug 31 07:05:55 2008 +0000 +++ b/alpha/asm.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ #error "Unknown compiler!" #endif -#endif /* FFMPEG_ASM_H */ +#endif /* AVCODEC_ALPHA_ASM_H */
--- a/alpha/regdef.h Sun Aug 31 07:05:55 2008 +0000 +++ b/alpha/regdef.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 */
--- a/armv4l/mathops.h Sun Aug 31 07:05:55 2008 +0000 +++ b/armv4l/mathops.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ #endif -#endif /* FFMPEG_ARMV4L_MATHOPS_H */ +#endif /* AVCODEC_ARMV4L_MATHOPS_H */
--- a/atrac3data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/atrac3data.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ /* 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 */
--- a/audioconvert.h Sun Aug 31 07:05:55 2008 +0000 +++ b/audioconvert.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ 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 */
--- a/avcodec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/avcodec.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ #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 */
--- a/bethsoftvideo.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bethsoftvideo.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ EOF_BLOCK = 0x14, }; -#endif /* FFMPEG_BETHSOFTVIDEO_H */ +#endif /* AVCODEC_BETHSOFTVIDEO_H */
--- a/bfin/config_bfin.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bfin/config_bfin.h Sun Aug 31 07:39:47 2008 +0000 @@ -30,8 +30,8 @@ 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 @@ #endif -#endif /* FFMPEG_CONFIG_BFIN_H */ +#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */
--- a/bfin/dsputil_bfin.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bfin/dsputil_bfin.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ #define bfprof() #endif -#endif /* FFMPEG_DSPUTIL_BFIN_H */ +#endif /* AVCODEC_BFIN_DSPUTIL_BFIN_H */
--- a/bfin/mathops.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bfin/mathops.h Sun Aug 31 07:39:47 2008 +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 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 */
--- a/bitstream.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bitstream.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ return 2 - get_bits1(gb); } -#endif /* FFMPEG_BITSTREAM_H */ +#endif /* AVCODEC_BITSTREAM_H */
--- a/bmp.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bmp.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ BMP_BITFIELDS =3, } BiCompression; -#endif /* FFMPEG_BMP_H */ +#endif /* AVCODEC_BMP_H */
--- a/bytestream.h Sun Aug 31 07:05:55 2008 +0000 +++ b/bytestream.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ (*b) += size; } -#endif /* FFMPEG_BYTESTREAM_H */ +#endif /* AVCODEC_BYTESTREAM_H */
--- a/cabac.h Sun Aug 31 07:05:55 2008 +0000 +++ b/cabac.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ } #endif /* 0 */ -#endif /* FFMPEG_CABAC_H */ +#endif /* AVCODEC_CABAC_H */
--- a/cavs.h Sun Aug 31 07:05:55 2008 +0000 +++ b/cavs.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ int ff_cavs_init(AVCodecContext *avctx); int ff_cavs_end (AVCodecContext *avctx); -#endif /* FFMPEG_CAVS_H */ +#endif /* AVCODEC_CAVS_H */
--- a/cavsdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/cavsdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -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_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 */
--- a/colorspace.h Sun Aug 31 07:05:55 2008 +0000 +++ b/colorspace.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ (((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 */
--- a/cookdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/cookdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ cplscale2, cplscale3, cplscale4, cplscale5, cplscale6, }; -#endif /* FFMPEG_COOKDATA_H */ +#endif /* AVCODEC_COOKDATA_H */
--- a/dca.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dca.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 */
--- a/dcadata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dcadata.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ */ -#endif /* FFMPEG_DCADATA_H */ +#endif /* AVCODEC_DCADATA_H */
--- a/dcahuff.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dcahuff.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL } }; -#endif /* FFMPEG_DCAHUFF_H */ +#endif /* AVCODEC_DCAHUFF_H */
--- a/dnxhddata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dnxhddata.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ int ff_dnxhd_get_cid_table(int cid); int ff_dnxhd_find_cid(AVCodecContext *avctx); -#endif /* FFMPEG_DNXHDDATA_H */ +#endif /* AVCODEC_DNXHDDATA_H */
--- a/dsputil.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dsputil.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ } } -#endif /* FFMPEG_DSPUTIL_H */ +#endif /* AVCODEC_DSPUTIL_H */
--- a/dvdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/dvdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ return 3; } -#endif /* FFMPEG_DVDATA_H */ +#endif /* AVCODEC_DVDATA_H */
--- a/elbg.h Sun Aug 31 07:05:55 2008 +0000 +++ b/elbg.h Sun Aug 31 07:39:47 2008 +0000 @@ -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 @@ int numCB, int num_steps, int *closest_cb, AVRandomState *rand_state); -#endif /* FFMPEG_ELBG_H */ +#endif /* AVCODEC_ELBG_H */
--- a/eval.h Sun Aug 31 07:05:55 2008 +0000 +++ b/eval.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * eval header. */ -#ifndef FFMPEG_EVAL_H -#define FFMPEG_EVAL_H +#ifndef AVCODEC_EVAL_H +#define AVCODEC_EVAL_H #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) /** @@ -84,4 +84,4 @@ double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque); void ff_eval_free(AVEvalExpr * e); -#endif /* FFMPEG_EVAL_H */ +#endif /* AVCODEC_EVAL_H */
--- a/faandct.h Sun Aug 31 07:05:55 2008 +0000 +++ b/faandct.h Sun Aug 31 07:39:47 2008 +0000 @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_FAANDCT_H -#define FFMPEG_FAANDCT_H +#ifndef AVCODEC_FAANDCT_H +#define AVCODEC_FAANDCT_H #include "dsputil.h" @@ -36,4 +36,4 @@ void ff_faandct(DCTELEM * data); void ff_faandct248(DCTELEM * data); -#endif /* FFMPEG_FAANDCT_H */ +#endif /* AVCODEC_FAANDCT_H */
--- a/faanidct.h Sun Aug 31 07:05:55 2008 +0000 +++ b/faanidct.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_FAANIDCT_H -#define FFMPEG_FAANIDCT_H +#ifndef AVCODEC_FAANIDCT_H +#define AVCODEC_FAANIDCT_H #include <stdint.h> #include "dsputil.h" @@ -29,4 +29,4 @@ void ff_faanidct_add(uint8_t *dest, int line_size, DCTELEM block[64]); void ff_faanidct_put(uint8_t *dest, int line_size, DCTELEM block[64]); -#endif /* FFMPEG_FAANIDCT_H */ +#endif /* AVCODEC_FAANIDCT_H */
--- a/flac.h Sun Aug 31 07:05:55 2008 +0000 +++ b/flac.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * FLAC (Free Lossless Audio Codec) decoder/demuxer common functions */ -#ifndef FFMPEG_FLAC_H -#define FFMPEG_FLAC_H +#ifndef AVCODEC_FLAC_H +#define AVCODEC_FLAC_H #include "avcodec.h" @@ -54,4 +54,4 @@ void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, const uint8_t *buffer); -#endif /* FFMPEG_FLAC_H */ +#endif /* AVCODEC_FLAC_H */
--- a/g729.h Sun Aug 31 07:05:55 2008 +0000 +++ b/g729.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,12 +18,12 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_G729_H -#define FFMPEG_G729_H +#ifndef AVCODEC_G729_H +#define AVCODEC_G729_H /** * maximum possible subframe size */ #define MAX_SUBFRAME_SIZE 44 -#endif // FFMPEG_G729_H +#endif // AVCODEC_G729_H
--- a/g729data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/g729data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_G729DATA_H -#define FFMPEG_G729DATA_H +#ifndef AVCODEC_G729DATA_H +#define AVCODEC_G729DATA_H #include <stdint.h> @@ -211,4 +211,4 @@ { -163, 674, -11, -886, 531, -1125, -265, -242, 724, 934} }; -#endif // FFMPEG_G729DATA_H +#endif // AVCODEC_G729DATA_H
--- a/golomb.h Sun Aug 31 07:05:55 2008 +0000 +++ b/golomb.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi */ -#ifndef FFMPEG_GOLOMB_H -#define FFMPEG_GOLOMB_H +#ifndef AVCODEC_GOLOMB_H +#define AVCODEC_GOLOMB_H #include <stdint.h> #include "bitstream.h" @@ -504,4 +504,4 @@ set_ur_golomb_jpegls(pb, v, k, limit, esc_len); } -#endif /* FFMPEG_GOLOMB_H */ +#endif /* AVCODEC_GOLOMB_H */
--- a/h261.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h261.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * h261codec. */ -#ifndef FFMPEG_H261_H -#define FFMPEG_H261_H +#ifndef AVCODEC_H261_H +#define AVCODEC_H261_H #include "mpegvideo.h" @@ -48,4 +48,4 @@ #define MB_TYPE_H261_FIL 0x800000 -#endif /* FFMPEG_H261_H */ +#endif /* AVCODEC_H261_H */
--- a/h261data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h261data.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * H.261 tables. */ -#ifndef FFMPEG_H261DATA_H -#define FFMPEG_H261DATA_H +#ifndef AVCODEC_H261DATA_H +#define AVCODEC_H261DATA_H #include <stdint.h> #include "h261.h" @@ -161,4 +161,4 @@ h261_tcoeff_level, }; -#endif /* FFMPEG_H261DATA_H */ +#endif /* AVCODEC_H261DATA_H */
--- a/h263.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h263.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_H263_H -#define FFMPEG_H263_H +#ifndef AVCODEC_H263_H +#define AVCODEC_H263_H #include "config.h" #include "msmpeg4.h" @@ -43,4 +43,4 @@ ENABLE_WMV_ENCODER) #define ENABLE_ANY_H263 (ENABLE_ANY_H263_DECODER || ENABLE_ANY_H263_ENCODER) -#endif /* FFMPEG_H263_H */ +#endif /* AVCODEC_H263_H */
--- a/h263_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h263_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_H263_PARSER_H -#define FFMPEG_H263_PARSER_H +#ifndef AVCODEC_H263_PARSER_H +#define AVCODEC_H263_PARSER_H #include "parser.h" int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_H263_PARSER_H */ +#endif /* AVCODEC_H263_PARSER_H */
--- a/h263data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h263data.h Sun Aug 31 07:39:47 2008 +0000 @@ -26,8 +26,8 @@ * H.263 tables. */ -#ifndef FFMPEG_H263DATA_H -#define FFMPEG_H263DATA_H +#ifndef AVCODEC_H263DATA_H +#define AVCODEC_H263DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -311,4 +311,4 @@ 0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12 }; -#endif /* FFMPEG_H263DATA_H */ +#endif /* AVCODEC_H263DATA_H */
--- a/h264.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h264.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_H -#define FFMPEG_H264_H +#ifndef AVCODEC_H264_H +#define AVCODEC_H264_H #include "dsputil.h" #include "cabac.h" @@ -435,4 +435,4 @@ }H264Context; -#endif /* FFMPEG_H264_H */ +#endif /* AVCODEC_H264_H */
--- a/h264_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h264_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_PARSER_H -#define FFMPEG_H264_PARSER_H +#ifndef AVCODEC_H264_PARSER_H +#define AVCODEC_H264_PARSER_H #include "h264.h" @@ -36,4 +36,4 @@ */ int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_H264_PARSER_H */ +#endif /* AVCODEC_H264_PARSER_H */
--- a/h264data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h264data.h Sun Aug 31 07:39:47 2008 +0000 @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264DATA_H -#define FFMPEG_H264DATA_H +#ifndef AVCODEC_H264DATA_H +#define AVCODEC_H264DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -1316,4 +1316,4 @@ } }; -#endif /* FFMPEG_H264DATA_H */ +#endif /* AVCODEC_H264DATA_H */
--- a/h264pred.h Sun Aug 31 07:05:55 2008 +0000 +++ b/h264pred.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264PRED_H -#define FFMPEG_H264PRED_H +#ifndef AVCODEC_H264PRED_H +#define AVCODEC_H264PRED_H #include "libavutil/common.h" @@ -79,4 +79,4 @@ void ff_h264_pred_init(H264PredContext *h, int codec_id); -#endif /* FFMPEG_H264PRED_H */ +#endif /* AVCODEC_H264PRED_H */
--- a/huffman.h Sun Aug 31 07:05:55 2008 +0000 +++ b/huffman.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_HUFFMAN_H -#define FFMPEG_HUFFMAN_H +#ifndef AVCODEC_HUFFMAN_H +#define AVCODEC_HUFFMAN_H #include "avcodec.h" #include "bitstream.h" @@ -39,4 +39,4 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, Node *nodes, huff_cmp_t cmp, int flags); -#endif /* FFMPEG_HUFFMAN_H */ +#endif /* AVCODEC_HUFFMAN_H */
--- a/i386/dsputil_mmx.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/dsputil_mmx.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_MMX_H -#define FFMPEG_DSPUTIL_MMX_H +#ifndef AVCODEC_I386_DSPUTIL_MMX_H +#define AVCODEC_I386_DSPUTIL_MMX_H #include <stdint.h> #include "libavcodec/dsputil.h" @@ -133,4 +133,4 @@ void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); -#endif /* FFMPEG_DSPUTIL_MMX_H */ +#endif /* AVCODEC_I386_DSPUTIL_MMX_H */
--- a/i386/h264_i386.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/h264_i386.h Sun Aug 31 07:39:47 2008 +0000 @@ -26,8 +26,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_H264_I386_H -#define FFMPEG_H264_I386_H +#ifndef AVCODEC_I386_H264_I386_H +#define AVCODEC_I386_H264_I386_H #include "libavcodec/cabac.h" @@ -152,4 +152,4 @@ #endif /* defined(ARCH_X86) && defined(HAVE_7REGS) && */ /* defined(HAVE_EBX_AVAILABLE) && !defined(BROKEN_RELOCATIONS) */ -#endif /* FFMPEG_H264_I386_H */ +#endif /* AVCODEC_I386_H264_I386_H */
--- a/i386/idct_xvid.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/idct_xvid.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * header for Xvid IDCT functions */ -#ifndef FFMPEG_IDCT_XVID_H -#define FFMPEG_IDCT_XVID_H +#ifndef AVCODEC_I386_IDCT_XVID_H +#define AVCODEC_I386_IDCT_XVID_H void ff_idct_xvid_mmx(short *block); void ff_idct_xvid_mmx2(short *block); @@ -32,4 +32,4 @@ void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block); void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block); -#endif /* FFMPEG_IDCT_XVID_H */ +#endif /* AVCODEC_I386_IDCT_XVID_H */
--- a/i386/mathops.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/mathops.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_I386_MATHOPS_H -#define FFMPEG_I386_MATHOPS_H +#ifndef AVCODEC_I386_MATHOPS_H +#define AVCODEC_I386_MATHOPS_H #ifdef FRAC_BITS # define MULL(ra, rb) \ @@ -42,4 +42,4 @@ asm ("imull %2\n\t" : "=A"(rt) : "a" ((int)ra), "g" ((int)rb));\ rt; }) -#endif /* FFMPEG_I386_MATHOPS_H */ +#endif /* AVCODEC_I386_MATHOPS_H */
--- a/i386/mmx.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/mmx.h Sun Aug 31 07:39:47 2008 +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 FFMPEG_MMX_H -#define FFMPEG_MMX_H +#ifndef AVCODEC_I386_MMX_H +#define AVCODEC_I386_MMX_H #warning Everything in this header is deprecated, use plain asm()! New code using this header will be rejected. @@ -282,4 +282,4 @@ #define punpckhqdq_r2r(regs,regd) mmx_r2r (punpckhqdq, regs, regd) -#endif /* FFMPEG_MMX_H */ +#endif /* AVCODEC_I386_MMX_H */
--- a/i386/vp3dsp_mmx.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/vp3dsp_mmx.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DSP_MMX_H -#define FFMPEG_VP3DSP_MMX_H +#ifndef AVCODEC_I386_VP3DSP_MMX_H +#define AVCODEC_I386_VP3DSP_MMX_H #include <stdint.h> #include "libavcodec/dsputil.h" @@ -29,4 +29,4 @@ void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_VP3DSP_MMX_H */ +#endif /* AVCODEC_I386_VP3DSP_MMX_H */
--- a/i386/vp3dsp_sse2.h Sun Aug 31 07:05:55 2008 +0000 +++ b/i386/vp3dsp_sse2.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DSP_SSE2_H -#define FFMPEG_VP3DSP_SSE2_H +#ifndef AVCODEC_I386_VP3DSP_SSE2_H +#define AVCODEC_I386_VP3DSP_SSE2_H #include "libavcodec/dsputil.h" @@ -28,4 +28,4 @@ void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block); void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_VP3DSP_SSE2_H */ +#endif /* AVCODEC_I386_VP3DSP_SSE2_H */
--- a/iirfilter.h Sun Aug 31 07:05:55 2008 +0000 +++ b/iirfilter.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * IIR filter interface */ -#ifndef FFMPEG_IIRFILTER_H -#define FFMPEG_IIRFILTER_H +#ifndef AVCODEC_IIRFILTER_H +#define AVCODEC_IIRFILTER_H #include "avcodec.h" @@ -100,4 +100,4 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, int size, const int16_t *src, int sstep, int16_t *dst, int dstep); -#endif /* FFMPEG_IIRFILTER_H */ +#endif /* AVCODEC_IIRFILTER_H */
--- a/imcdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/imcdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMCDATA_H -#define FFMPEG_IMCDATA_H +#ifndef AVCODEC_IMCDATA_H +#define AVCODEC_IMCDATA_H #include <stdint.h> @@ -166,4 +166,4 @@ } }; -#endif /* FFMPEG_IMCDATA_H */ +#endif /* AVCODEC_IMCDATA_H */
--- a/imgconvert.h Sun Aug 31 07:05:55 2008 +0000 +++ b/imgconvert.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMGCONVERT_H -#define FFMPEG_IMGCONVERT_H +#ifndef AVCODEC_IMGCONVERT_H +#define AVCODEC_IMGCONVERT_H #include <stdint.h> #include "avcodec.h" @@ -33,4 +33,4 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane); -#endif /* FFMPEG_IMGCONVERT_H */ +#endif /* AVCODEC_IMGCONVERT_H */
--- a/indeo2data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/indeo2data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INDEO2DATA_H -#define FFMPEG_INDEO2DATA_H +#ifndef AVCODEC_INDEO2DATA_H +#define AVCODEC_INDEO2DATA_H #include <stdint.h> @@ -138,4 +138,4 @@ 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80 }; -#endif /* FFMPEG_INDEO2DATA_H */ +#endif /* AVCODEC_INDEO2DATA_H */
--- a/indeo3data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/indeo3data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INDEO3DATA_H -#define FFMPEG_INDEO3DATA_H +#ifndef AVCODEC_INDEO3DATA_H +#define AVCODEC_INDEO3DATA_H #include <stdint.h> @@ -2339,4 +2339,4 @@ 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; -#endif /* FFMPEG_INDEO3DATA_H */ +#endif /* AVCODEC_INDEO3DATA_H */
--- a/intrax8.h Sun Aug 31 07:05:55 2008 +0000 +++ b/intrax8.h Sun Aug 31 07:39:47 2008 +0000 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INTRAX8_H -#define FFMPEG_INTRAX8_H +#ifndef AVCODEC_INTRAX8_H +#define AVCODEC_INTRAX8_H #include "bitstream.h" #include "mpegvideo.h" @@ -54,4 +54,4 @@ void ff_intrax8_common_end(IntraX8Context * w); int ff_intrax8_decode_picture(IntraX8Context * w, int quant, int halfpq); -#endif /* FFMPEG_INTRAX8_H */ +#endif /* AVCODEC_INTRAX8_H */
--- a/intrax8huf.h Sun Aug 31 07:05:55 2008 +0000 +++ b/intrax8huf.h Sun Aug 31 07:39:47 2008 +0000 @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_INTRAX8HUF_H -#define FFMPEG_INTRAX8HUF_H +#ifndef AVCODEC_INTRAX8HUF_H +#define AVCODEC_INTRAX8HUF_H #include <inttypes.h> @@ -915,4 +915,4 @@ }; #define MAX_AC_VLC_BITS 16 -#endif /* FFMPEG_INTRAX8HUF_H */ +#endif /* AVCODEC_INTRAX8HUF_H */
--- a/jpegls.h Sun Aug 31 07:05:55 2008 +0000 +++ b/jpegls.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * JPEG-LS common code. */ -#ifndef FFMPEG_JPEGLS_H -#define FFMPEG_JPEGLS_H +#ifndef AVCODEC_JPEGLS_H +#define AVCODEC_JPEGLS_H #include "avcodec.h" @@ -108,4 +108,4 @@ #define R(a, i ) (bits == 8 ? ((uint8_t*)(a))[i] : ((uint16_t*)(a))[i] ) #define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v)) -#endif /* FFMPEG_JPEGLS_H */ +#endif /* AVCODEC_JPEGLS_H */
--- a/jpeglsdec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/jpeglsdec.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * JPEG-LS decoder. */ -#ifndef FFMPEG_JPEGLSDEC_H -#define FFMPEG_JPEGLSDEC_H +#ifndef AVCODEC_JPEGLSDEC_H +#define AVCODEC_JPEGLSDEC_H #include "mjpeg.h" #include "mjpegdec.h" @@ -38,4 +38,4 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv); -#endif /* FFMPEG_JPEGLSDEC_H */ +#endif /* AVCODEC_JPEGLSDEC_H */
--- a/lcl.h Sun Aug 31 07:05:55 2008 +0000 +++ b/lcl.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LCL_H -#define FFMPEG_LCL_H +#ifndef AVCODEC_LCL_H +#define AVCODEC_LCL_H #define BMPTYPE_YUV 1 #define BMPTYPE_RGB 2 @@ -46,4 +46,4 @@ #define CODEC_MSZH 1 #define CODEC_ZLIB 3 -#endif /* FFMPEG_LCL_H */ +#endif /* AVCODEC_LCL_H */
--- a/libdirac.h Sun Aug 31 07:05:55 2008 +0000 +++ b/libdirac.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * data structures common to libdiracenc.c and libdiracdec.c */ -#ifndef FFMPEG_LIBDIRAC_H -#define FFMPEG_LIBDIRAC_H +#ifndef AVCODEC_LIBDIRAC_H +#define AVCODEC_LIBDIRAC_H #include "config.h" @@ -46,4 +46,4 @@ }; #endif /* CONFIG_LIBDIRAC */ -#endif /* FFMPEG_LIBDIRAC_H */ +#endif /* AVCODEC_LIBDIRAC_H */
--- a/libdirac_libschro.h Sun Aug 31 07:05:55 2008 +0000 +++ b/libdirac_libschro.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * data structures common to libdirac and libschroedinger */ -#ifndef FFMPEG_LIBDIRAC_LIBSCHRO_H -#define FFMPEG_LIBDIRAC_LIBSCHRO_H +#ifndef AVCODEC_LIBDIRAC_LIBSCHRO_H +#define AVCODEC_LIBDIRAC_LIBSCHRO_H #include "avcodec.h" @@ -106,4 +106,4 @@ */ void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue, void (*free_func)(void *)); -#endif /* FFMPEG_LIBDIRAC_LIBSCHRO_H */ +#endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */
--- a/libschroedinger.h Sun Aug 31 07:05:55 2008 +0000 +++ b/libschroedinger.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * data structures common to libschroedingerdec.c and libschroedingerenc.c */ -#ifndef FFMPEG_LIBSCHROEDINGER_H -#define FFMPEG_LIBSCHROEDINGER_H +#ifndef AVCODEC_LIBSCHROEDINGER_H +#define AVCODEC_LIBSCHROEDINGER_H #include "config.h" @@ -58,4 +58,4 @@ SchroFrameFormat *schro_frame_fmt); #endif /* CONFIG_LIBSCHROEDINGER */ -#endif /* FFMPEG_LIBSCHROEDINGER_H */ +#endif /* AVCODEC_LIBSCHROEDINGER_H */
--- a/libxvid_internal.h Sun Aug 31 07:05:55 2008 +0000 +++ b/libxvid_internal.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LIBXVID_INTERNAL_H -#define FFMPEG_LIBXVID_INTERNAL_H +#ifndef AVCODEC_LIBXVID_INTERNAL_H +#define AVCODEC_LIBXVID_INTERNAL_H /** * @file libxvid_internal.h @@ -29,4 +29,4 @@ int av_tempfile(char *prefix, char **filename); -#endif /* FFMPEG_LIBXVID_INTERNAL_H */ +#endif /* AVCODEC_LIBXVID_INTERNAL_H */
--- a/lpc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/lpc.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LPC_H -#define FFMPEG_LPC_H +#ifndef AVCODEC_LPC_H +#define AVCODEC_LPC_H #include <stdint.h> #include "dsputil.h" @@ -45,4 +45,4 @@ int32_t coefs[][MAX_LPC_ORDER], int *shift, int use_lpc, int omethod, int max_shift, int zero_shift); -#endif /* FFMPEG_LPC_H */ +#endif /* AVCODEC_LPC_H */
--- a/lsp.h Sun Aug 31 07:05:55 2008 +0000 +++ b/lsp.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_LSP_H -#define FFMPEG_LSP_H +#ifndef AVCODEC_LSP_H +#define AVCODEC_LSP_H #include <stdint.h> @@ -67,4 +67,4 @@ */ void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order); -#endif /* FFMPEG_LSP_H */ +#endif /* AVCODEC_LSP_H */
--- a/lzw.h Sun Aug 31 07:05:55 2008 +0000 +++ b/lzw.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * Modified for use in TIFF by Konstantin Shishkov */ -#ifndef FFMPEG_LZW_H -#define FFMPEG_LZW_H +#ifndef AVCODEC_LZW_H +#define AVCODEC_LZW_H #include "bitstream.h" @@ -56,4 +56,4 @@ int ff_lzw_encode(struct LZWEncodeState * s, const uint8_t * inbuf, int insize); int ff_lzw_encode_flush(struct LZWEncodeState * s); -#endif /* FFMPEG_LZW_H */ +#endif /* AVCODEC_LZW_H */
--- a/mathops.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mathops.h Sun Aug 31 07:39:47 2008 +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 FFMPEG_MATHOPS_H -#define FFMPEG_MATHOPS_H +#ifndef AVCODEC_MATHOPS_H +#define AVCODEC_MATHOPS_H #include "libavutil/common.h" @@ -83,5 +83,5 @@ # define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb)) #endif -#endif /* FFMPEG_MATHOPS_H */ +#endif /* AVCODEC_MATHOPS_H */
--- a/mjpeg.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mjpeg.h Sun Aug 31 07:39:47 2008 +0000 @@ -30,8 +30,8 @@ * MJPEG encoder and decoder. */ -#ifndef FFMPEG_MJPEG_H -#define FFMPEG_MJPEG_H +#ifndef AVCODEC_MJPEG_H +#define AVCODEC_MJPEG_H #include "avcodec.h" #include "bitstream.h" @@ -152,4 +152,4 @@ const uint8_t *bits_table, const uint8_t *val_table); -#endif /* FFMPEG_MJPEG_H */ +#endif /* AVCODEC_MJPEG_H */
--- a/mjpegdec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mjpegdec.h Sun Aug 31 07:39:47 2008 +0000 @@ -26,8 +26,8 @@ * MJPEG decoder. */ -#ifndef FFMPEG_MJPEGDEC_H -#define FFMPEG_MJPEGDEC_H +#ifndef AVCODEC_MJPEGDEC_H +#define AVCODEC_MJPEGDEC_H #include "avcodec.h" #include "bitstream.h" @@ -108,4 +108,4 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s); int ff_mjpeg_decode_sos(MJpegDecodeContext *s); -#endif /* FFMPEG_MJPEGDEC_H */ +#endif /* AVCODEC_MJPEGDEC_H */
--- a/mjpegenc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mjpegenc.h Sun Aug 31 07:39:47 2008 +0000 @@ -30,8 +30,8 @@ * MJPEG encoder. */ -#ifndef FFMPEG_MJPEGENC_H -#define FFMPEG_MJPEGENC_H +#ifndef AVCODEC_MJPEGENC_H +#define AVCODEC_MJPEGENC_H #include "dsputil.h" #include "mpegvideo.h" @@ -57,4 +57,4 @@ uint8_t *huff_size, uint16_t *huff_code); void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]); -#endif /* FFMPEG_MJPEGENC_H */ +#endif /* AVCODEC_MJPEGENC_H */
--- a/mlp.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mlp.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MLP_H -#define FFMPEG_MLP_H +#ifndef AVCODEC_MLP_H +#define AVCODEC_MLP_H #include <stdint.h> @@ -118,4 +118,4 @@ return value; } -#endif /* FFMPEG_MLP_H */ +#endif /* AVCODEC_MLP_H */
--- a/mlp_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mlp_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * MLP parser prototypes */ -#ifndef FFMPEG_MLP_PARSER_H -#define FFMPEG_MLP_PARSER_H +#ifndef AVCODEC_MLP_PARSER_H +#define AVCODEC_MLP_PARSER_H #include "bitstream.h" @@ -55,5 +55,5 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb); -#endif /* FFMPEG_MLP_PARSER_H */ +#endif /* AVCODEC_MLP_PARSER_H */
--- a/mpc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpc.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * divided into 32 subbands. */ -#ifndef FFMPEG_MPC_H -#define FFMPEG_MPC_H +#ifndef AVCODEC_MPC_H +#define AVCODEC_MPC_H #include "libavutil/random.h" #include "avcodec.h" @@ -77,4 +77,4 @@ extern void ff_mpc_init(); extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst); -#endif /* FFMPEG_MPC_H */ +#endif /* AVCODEC_MPC_H */
--- a/mpc7data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpc7data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC7DATA_H -#define FFMPEG_MPC7DATA_H +#ifndef AVCODEC_MPC7DATA_H +#define AVCODEC_MPC7DATA_H #include <stdint.h> @@ -168,4 +168,4 @@ } }; -#endif /* FFMPEG_MPC7DATA_H */ +#endif /* AVCODEC_MPC7DATA_H */
--- a/mpc8data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpc8data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC8DATA_H -#define FFMPEG_MPC8DATA_H +#ifndef AVCODEC_MPC8DATA_H +#define AVCODEC_MPC8DATA_H #include <stdint.h> @@ -118,4 +118,4 @@ {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 103, 55, 3347, 12419, 56459, 16987, 313105, 54177, 3076873, 3739321, 3132677, 66353813, 123012781, 236330717, 0} }; -#endif /* FFMPEG_MPC8DATA_H */ +#endif /* AVCODEC_MPC8DATA_H */
--- a/mpc8huff.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpc8huff.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPC8HUFF_H -#define FFMPEG_MPC8HUFF_H +#ifndef AVCODEC_MPC8HUFF_H +#define AVCODEC_MPC8HUFF_H #include <stdint.h> @@ -575,4 +575,4 @@ } }; -#endif /* FFMPEG_MPC8HUFF_H */ +#endif /* AVCODEC_MPC8HUFF_H */
--- a/mpcdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpcdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPCDATA_H -#define FFMPEG_MPCDATA_H +#ifndef AVCODEC_MPCDATA_H +#define AVCODEC_MPCDATA_H #include <stdint.h> @@ -65,4 +65,4 @@ 0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789 }; -#endif /* FFMPEG_MPCDATA_H */ +#endif /* AVCODEC_MPCDATA_H */
--- a/mpeg12.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg12.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG12_H -#define FFMPEG_MPEG12_H +#ifndef AVCODEC_MPEG12_H +#define AVCODEC_MPEG12_H #include "mpegvideo.h" @@ -56,4 +56,4 @@ return diff; } -#endif /* FFMPEG_MPEG12_H */ +#endif /* AVCODEC_MPEG12_H */
--- a/mpeg12data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg12data.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * MPEG1/2 tables. */ -#ifndef FFMPEG_MPEG12DATA_H -#define FFMPEG_MPEG12DATA_H +#ifndef AVCODEC_MPEG12DATA_H +#define AVCODEC_MPEG12DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -53,4 +53,4 @@ extern const float ff_mpeg1_aspect[16]; extern const AVRational ff_mpeg2_aspect[16]; -#endif /* FFMPEG_MPEG12DATA_H */ +#endif /* AVCODEC_MPEG12DATA_H */
--- a/mpeg12decdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg12decdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * MPEG1/2 decoder tables. */ -#ifndef FFMPEG_MPEG12DECDATA_H -#define FFMPEG_MPEG12DECDATA_H +#ifndef AVCODEC_MPEG12DECDATA_H +#define AVCODEC_MPEG12DECDATA_H #include <stdint.h> #include "mpegvideo.h" @@ -121,4 +121,4 @@ mpeg2_dc_scale_table3, }; -#endif /* FFMPEG_MPEG12DECDATA_H */ +#endif /* AVCODEC_MPEG12DECDATA_H */
--- a/mpeg4audio.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg4audio.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG4AUDIO_H -#define FFMPEG_MPEG4AUDIO_H +#ifndef AVCODEC_MPEG4AUDIO_H +#define AVCODEC_MPEG4AUDIO_H #include <stdint.h> @@ -46,4 +46,4 @@ */ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_MPEGAUDIO_H */ +#endif /* AVCODEC_MPEG4AUDIO_H */
--- a/mpeg4data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg4data.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * mpeg4 tables. */ -#ifndef FFMPEG_MPEG4DATA_H -#define FFMPEG_MPEG4DATA_H +#ifndef AVCODEC_MPEG4DATA_H +#define AVCODEC_MPEG4DATA_H #include <stdint.h> #include "mpegvideo.h" @@ -429,4 +429,4 @@ 99, 13, 15, 17, 19, 21, 23, 0 }; -#endif /* FFMPEG_MPEG4DATA_H */ +#endif /* AVCODEC_MPEG4DATA_H */
--- a/mpeg4video_parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpeg4video_parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MPEG4VIDEO_PARSER_H -#define FFMPEG_MPEG4VIDEO_PARSER_H +#ifndef AVCODEC_MPEG4VIDEO_PARSER_H +#define AVCODEC_MPEG4VIDEO_PARSER_H #include "parser.h" @@ -31,4 +31,4 @@ */ int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_MPEG4VIDEO_PARSER_H */ +#endif /* AVCODEC_MPEG4VIDEO_PARSER_H */
--- a/mpegaudio.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegaudio.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * mpeg audio declarations for both encoder and decoder. */ -#ifndef FFMPEG_MPEGAUDIO_H -#define FFMPEG_MPEGAUDIO_H +#ifndef AVCODEC_MPEGAUDIO_H +#define AVCODEC_MPEGAUDIO_H #include "avcodec.h" #include "bitstream.h" @@ -152,4 +152,4 @@ return 0; } -#endif /* FFMPEG_MPEGAUDIO_H */ +#endif /* AVCODEC_MPEGAUDIO_H */
--- a/mpegaudiodata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegaudiodata.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * mpeg audio layer common tables. */ -#ifndef FFMPEG_MPEGAUDIODATA_H -#define FFMPEG_MPEGAUDIODATA_H +#ifndef AVCODEC_MPEGAUDIODATA_H +#define AVCODEC_MPEGAUDIODATA_H #include "libavutil/common.h" @@ -40,4 +40,4 @@ extern const int ff_mpa_quant_bits[17]; extern const unsigned char * const ff_mpa_alloc_tables[5]; -#endif /* FFMPEG_MPEGAUDIODATA_H */ +#endif /* AVCODEC_MPEGAUDIODATA_H */
--- a/mpegaudiodecheader.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegaudiodecheader.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * MPEG Audio header decoder. */ -#ifndef FFMPEG_MPEGAUDIODECHEADER_H -#define FFMPEG_MPEGAUDIODECHEADER_H +#ifndef AVCODEC_MPEGAUDIODECHEADER_H +#define AVCODEC_MPEGAUDIODECHEADER_H #include "libavutil/common.h" #include "mpegaudio.h" @@ -36,4 +36,4 @@ that the frame size must be computed externally */ int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header); -#endif /* FFMPEG_MPEGAUDIODECHEADER_H */ +#endif /* AVCODEC_MPEGAUDIODECHEADER_H */
--- a/mpegaudiodectab.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegaudiodectab.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * mpeg audio layer decoder tables. */ -#ifndef FFMPEG_MPEGAUDIODECTAB_H -#define FFMPEG_MPEGAUDIODECTAB_H +#ifndef AVCODEC_MPEGAUDIODECTAB_H +#define AVCODEC_MPEGAUDIODECTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -603,4 +603,4 @@ -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037, }; -#endif /* FFMPEG_MPEGAUDIODECTAB_H */ +#endif /* AVCODEC_MPEGAUDIODECTAB_H */
--- a/mpegaudiotab.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegaudiotab.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * Most of them come from the mpeg audio specification. */ -#ifndef FFMPEG_MPEGAUDIOTAB_H -#define FFMPEG_MPEGAUDIOTAB_H +#ifndef AVCODEC_MPEGAUDIOTAB_H +#define AVCODEC_MPEGAUDIOTAB_H #include <stdint.h> #include "mpegaudio.h" @@ -115,4 +115,4 @@ static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 }; -#endif /* FFMPEG_MPEGAUDIOTAB_H */ +#endif /* AVCODEC_MPEGAUDIOTAB_H */
--- a/mpegvideo.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegvideo.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * mpegvideo header. */ -#ifndef FFMPEG_MPEGVIDEO_H -#define FFMPEG_MPEGVIDEO_H +#ifndef AVCODEC_MPEGVIDEO_H +#define AVCODEC_MPEGVIDEO_H #include "dsputil.h" #include "bitstream.h" @@ -863,5 +863,5 @@ DCTELEM block[6][64], int motion_x, int motion_y); -#endif /* FFMPEG_MPEGVIDEO_H */ +#endif /* AVCODEC_MPEGVIDEO_H */
--- a/mpegvideo_common.h Sun Aug 31 07:05:55 2008 +0000 +++ b/mpegvideo_common.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * The simplest mpeg encoder (well, it was the simplest!). */ -#ifndef FFMPEG_MPEGVIDEO_COMMON_H -#define FFMPEG_MPEGVIDEO_COMMON_H +#ifndef AVCODEC_MPEGVIDEO_COMMON_H +#define AVCODEC_MPEGVIDEO_COMMON_H #include "avcodec.h" #include "dsputil.h" @@ -898,4 +898,4 @@ MPV_motion_internal(s, dest_y, dest_cb, dest_cr, dir, ref_picture, pix_op, qpix_op, 0); } -#endif /* FFMPEG_MPEGVIDEO_COMMON_H */ +#endif /* AVCODEC_MPEGVIDEO_COMMON_H */
--- a/msmpeg4.h Sun Aug 31 07:05:55 2008 +0000 +++ b/msmpeg4.h Sun Aug 31 07:39:47 2008 +0000 @@ -23,8 +23,8 @@ * @file msmpeg4.h */ -#ifndef FFMPEG_MSMPEG4_H -#define FFMPEG_MSMPEG4_H +#ifndef AVCODEC_MSMPEG4_H +#define AVCODEC_MSMPEG4_H #include "config.h" #include "avcodec.h" @@ -62,4 +62,4 @@ #define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER) #define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER) -#endif /* FFMPEG_MSMPEG4_H */ +#endif /* AVCODEC_MSMPEG4_H */
--- a/msmpeg4data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/msmpeg4data.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * MSMPEG4 data tables. */ -#ifndef FFMPEG_MSMPEG4DATA_H -#define FFMPEG_MSMPEG4DATA_H +#ifndef AVCODEC_MSMPEG4DATA_H +#define AVCODEC_MSMPEG4DATA_H #include "libavutil/common.h" #include "bitstream.h" @@ -96,4 +96,4 @@ extern const uint8_t wmv2_scantableA[64]; extern const uint8_t wmv2_scantableB[64]; -#endif /* FFMPEG_MSMPEG4DATA_H */ +#endif /* AVCODEC_MSMPEG4DATA_H */
--- a/nellymoser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/nellymoser.h Sun Aug 31 07:39:47 2008 +0000 @@ -31,8 +31,8 @@ * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ -#ifndef FFMPEG_NELLYMOSER_H -#define FFMPEG_NELLYMOSER_H +#ifndef AVCODEC_NELLYMOSER_H +#define AVCODEC_NELLYMOSER_H #include "avcodec.h"
--- a/opt.h Sun Aug 31 07:05:55 2008 +0000 +++ b/opt.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_OPT_H -#define FFMPEG_OPT_H +#ifndef AVCODEC_OPT_H +#define AVCODEC_OPT_H /** * @file opt.h @@ -141,4 +141,4 @@ void av_opt_set_defaults(void *s); void av_opt_set_defaults2(void *s, int mask, int flags); -#endif /* FFMPEG_OPT_H */ +#endif /* AVCODEC_OPT_H */
--- a/parser.h Sun Aug 31 07:05:55 2008 +0000 +++ b/parser.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PARSER_H -#define FFMPEG_PARSER_H +#ifndef AVCODEC_PARSER_H +#define AVCODEC_PARSER_H #include "avcodec.h" @@ -66,4 +66,4 @@ */ void ff_fetch_timestamp(AVCodecParserContext *s, int off, int remove); -#endif /* FFMPEG_PARSER_H */ +#endif /* AVCODEC_PARSER_H */
--- a/png.h Sun Aug 31 07:05:55 2008 +0000 +++ b/png.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PNG_H -#define FFMPEG_PNG_H +#ifndef AVCODEC_PNG_H +#define AVCODEC_PNG_H #include <stdint.h> @@ -74,4 +74,4 @@ /* compute the row size of an interleaved pass */ extern int ff_png_pass_row_size(int pass, int bits_per_pixel, int width); -#endif /* FFMPEG_PNG_H */ +#endif /* AVCODEC_PNG_H */
--- a/pnm.h Sun Aug 31 07:05:55 2008 +0000 +++ b/pnm.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PNM_H -#define FFMPEG_PNM_H +#ifndef AVCODEC_PNM_H +#define AVCODEC_PNM_H #include "avcodec.h" @@ -34,4 +34,4 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s); -#endif /* FFMPEG_PNM_H */ +#endif /* AVCODEC_PNM_H */
--- a/ppc/dsputil_altivec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/dsputil_altivec.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_ALTIVEC_H -#define FFMPEG_DSPUTIL_ALTIVEC_H +#ifndef AVCODEC_PPC_DSPUTIL_ALTIVEC_H +#define AVCODEC_PPC_DSPUTIL_ALTIVEC_H #include <stdint.h> @@ -31,4 +31,4 @@ void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); -#endif /* FFMPEG_DSPUTIL_ALTIVEC_H */ +#endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */
--- a/ppc/dsputil_ppc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/dsputil_ppc.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_DSPUTIL_PPC_H -#define FFMPEG_DSPUTIL_PPC_H +#ifndef AVCODEC_PPC_DSPUTIL_PPC_H +#define AVCODEC_PPC_DSPUTIL_PPC_H #ifdef CONFIG_POWERPC_PERF void powerpc_display_perf_report(void); @@ -149,4 +149,4 @@ #define POWERPC_PERF_STOP_COUNT(a, cond) do {} while (0) #endif /* CONFIG_POWERPC_PERF */ -#endif /* FFMPEG_DSPUTIL_PPC_H */ +#endif /* AVCODEC_PPC_DSPUTIL_PPC_H */
--- a/ppc/gcc_fixes.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/gcc_fixes.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_GCC_FIXES_H -#define FFMPEG_GCC_FIXES_H +#ifndef AVCODEC_PPC_GCC_FIXES_H +#define AVCODEC_PPC_GCC_FIXES_H #include "config.h" @@ -99,4 +99,4 @@ #endif /* (__GNUC__ == 3 && __GNUC_MINOR__ < 3) */ -#endif /* FFMPEG_GCC_FIXES_H */ +#endif /* AVCODEC_PPC_GCC_FIXES_H */
--- a/ppc/imgresample_altivec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/imgresample_altivec.h Sun Aug 31 07:39:47 2008 +0000 @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_IMGRESAMPLE_ALTIVEC_H -#define FFMPEG_IMGRESAMPLE_ALTIVEC_H +#ifndef AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H +#define AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H #include <stdint.h> void v_resample16_altivec(uint8_t *dst, int dst_width, const uint8_t *src, int wrap, int16_t *filter); -#endif /* FFMPEG_IMGRESAMPLE_ALTIVEC_H */ +#endif /* AVCODEC_PPC_IMGRESAMPLE_ALTIVEC_H */
--- a/ppc/mathops.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/mathops.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_PPC_MATHOPS_H -#define FFMPEG_PPC_MATHOPS_H +#ifndef AVCODEC_PPC_MATHOPS_H +#define AVCODEC_PPC_MATHOPS_H #if defined(ARCH_POWERPC_405) /* signed 16x16 -> 32 multiply add accumulate */ @@ -35,4 +35,4 @@ __rt; }) #endif -#endif /* FFMPEG_PPC_MATHOPS_H */ +#endif /* AVCODEC_PPC_MATHOPS_H */
--- a/ppc/types_altivec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/types_altivec.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_TYPES_ALTIVEC_H -#define FFMPEG_TYPES_ALTIVEC_H +#ifndef AVCODEC_PPC_TYPES_ALTIVEC_H +#define AVCODEC_PPC_TYPES_ALTIVEC_H /*********************************************************************** * Vector types @@ -43,4 +43,4 @@ #define zero_u32v (vec_u32_t) zerov #define zero_s32v (vec_s32_t) zerov -#endif /* FFMPEG_TYPES_ALTIVEC_H */ +#endif /* AVCODEC_PPC_TYPES_ALTIVEC_H */
--- a/ppc/util_altivec.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ppc/util_altivec.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Contains misc utility macros and inline functions */ -#ifndef FFMPEG_UTIL_ALTIVEC_H -#define FFMPEG_UTIL_ALTIVEC_H +#ifndef AVCODEC_PPC_UTIL_ALTIVEC_H +#define AVCODEC_PPC_UTIL_ALTIVEC_H #include <stdint.h> @@ -102,4 +102,4 @@ return vec_perm(first, second, mask); } -#endif /* FFMPEG_UTIL_ALTIVEC_H */ +#endif /* AVCODEC_PPC_UTIL_ALTIVEC_H */
--- a/ps2/mmi.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ps2/mmi.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_MMI_H -#define FFMPEG_MMI_H +#ifndef AVCODEC_PS2_MMI_H +#define AVCODEC_PS2_MMI_H #define align16 __attribute__ ((aligned (16))) @@ -168,4 +168,4 @@ #define pextlb(rs, rt, rd) \ asm volatile ("pextlb " #rd ", " #rs ", " #rt ) -#endif /* FFMPEG_MMI_H */ +#endif /* AVCODEC_PS2_MMI_H */
--- a/qdm2data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/qdm2data.h Sun Aug 31 07:39:47 2008 +0000 @@ -27,8 +27,8 @@ * Various QDM2 tables. */ -#ifndef FFMPEG_QDM2DATA_H -#define FFMPEG_QDM2DATA_H +#ifndef AVCODEC_QDM2DATA_H +#define AVCODEC_QDM2DATA_H #include <stdint.h> @@ -528,4 +528,4 @@ 0.138071194291115f,0.333333343267441f,0.60947573184967f,1.0f,0.0f, }; -#endif /* FFMPEG_QDM2DATA_H */ +#endif /* AVCODEC_QDM2DATA_H */
--- a/ra144.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ra144.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RA144_H -#define FFMPEG_RA144_H +#ifndef AVCODEC_RA144_H +#define AVCODEC_RA144_H #include <stdint.h> @@ -1552,4 +1552,4 @@ lpc_refl_cb6, lpc_refl_cb7, lpc_refl_cb8, lpc_refl_cb9, lpc_refl_cb10 }; -#endif /* FFMPEG_RA144_H */ +#endif /* AVCODEC_RA144_H */
--- a/ra288.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ra288.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RA288_H -#define FFMPEG_RA288_H +#ifndef AVCODEC_RA288_H +#define AVCODEC_RA288_H static const float amptable[8]={ 0.515625, 0.90234375, 1.57910156, 2.76342773, @@ -206,4 +206,4 @@ 0.553955078, 0.50201416, 0.454956055, 0.41229248, 0.373657227 }; -#endif /* FFMPEG_RA288_H */ +#endif /* AVCODEC_RA288_H */
--- a/rangecoder.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rangecoder.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * Range coder. */ -#ifndef FFMPEG_RANGECODER_H -#define FFMPEG_RANGECODER_H +#ifndef AVCODEC_RANGECODER_H +#define AVCODEC_RANGECODER_H #include <stdint.h> #include <assert.h> @@ -138,4 +138,4 @@ #endif } -#endif /* FFMPEG_RANGECODER_H */ +#endif /* AVCODEC_RANGECODER_H */
--- a/ratecontrol.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ratecontrol.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RATECONTROL_H -#define FFMPEG_RATECONTROL_H +#ifndef AVCODEC_RATECONTROL_H +#define AVCODEC_RATECONTROL_H /** * @file ratecontrol.h @@ -101,5 +101,5 @@ void ff_xvid_rate_control_uninit(struct MpegEncContext *s); float ff_xvid_rate_estimate_qscale(struct MpegEncContext *s, int dry_run); -#endif /* FFMPEG_RATECONTROL_H */ +#endif /* AVCODEC_RATECONTROL_H */
--- a/raw.h Sun Aug 31 07:05:55 2008 +0000 +++ b/raw.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * Raw Video Codec */ -#ifndef FFMPEG_RAW_H -#define FFMPEG_RAW_H +#ifndef AVCODEC_RAW_H +#define AVCODEC_RAW_H #include "avcodec.h" @@ -36,4 +36,4 @@ extern const PixelFormatTag ff_raw_pixelFormatTags[]; -#endif /* FFMPEG_RAW_H */ +#endif /* AVCODEC_RAW_H */
--- a/rectangle.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rectangle.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ -#ifndef FFMPEG_RECTANGLE_H -#define FFMPEG_RECTANGLE_H +#ifndef AVCODEC_RECTANGLE_H +#define AVCODEC_RECTANGLE_H #include "libavutil/common.h" @@ -118,4 +118,4 @@ assert(h==4); } -#endif /* FFMPEG_RECTANGLE_H */ +#endif /* AVCODEC_RECTANGLE_H */
--- a/rl.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rl.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * rl header. */ -#ifndef FFMPEG_RL_H -#define FFMPEG_RL_H +#ifndef AVCODEC_RL_H +#define AVCODEC_RL_H #include <stdint.h> #include "bitstream.h" @@ -83,4 +83,4 @@ return index + level - 1; } -#endif /* FFMPEG_RL_H */ +#endif /* AVCODEC_RL_H */
--- a/rle.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rle.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RLE_H -#define FFMPEG_RLE_H +#ifndef AVCODEC_RLE_H +#define AVCODEC_RLE_H #include <stdint.h> @@ -36,4 +36,4 @@ int ff_rle_encode(uint8_t *outbuf, int out_size, const uint8_t *inbuf, int bpp, int w, int add_rep, int xor_rep, int add_raw, int xor_raw); -#endif /* FFMPEG_RLE_H */ +#endif /* AVCODEC_RLE_H */
--- a/roqvideo.h Sun Aug 31 07:05:55 2008 +0000 +++ b/roqvideo.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ROQVIDEO_H -#define FFMPEG_ROQVIDEO_H +#ifndef AVCODEC_ROQVIDEO_H +#define AVCODEC_ROQVIDEO_H #include "libavutil/random.h" #include "avcodec.h" @@ -89,4 +89,4 @@ void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); -#endif /* FFMPEG_ROQVIDEO_H */ +#endif /* AVCODEC_ROQVIDEO_H */
--- a/rtjpeg.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rtjpeg.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_RTJPEG_H -#define FFMPEG_RTJPEG_H +#ifndef AVCODEC_RTJPEG_H +#define AVCODEC_RTJPEG_H #include <stdint.h> #include "dsputil.h" @@ -39,4 +39,4 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, const uint8_t *buf, int buf_size); -#endif /* FFMPEG_RTJPEG_H */ +#endif /* AVCODEC_RTJPEG_H */
--- a/rv30data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv30data.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * miscellaneous RV30 tables */ -#ifndef FFMPEG_RV30DATA_H -#define FFMPEG_RV30DATA_H +#ifndef AVCODEC_RV30DATA_H +#define AVCODEC_RV30DATA_H #include <stdint.h> @@ -171,4 +171,4 @@ 2, 7, 8, 4, 0, 6, 1, 5, 3, 2, 8, 3, 0, 7, 4, 1, 6, 5, }; -#endif /* FFMPEG_RV30DATA_H */ +#endif /* AVCODEC_RV30DATA_H */
--- a/rv34.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv34.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * RV30 and RV40 decoder common data declarations */ -#ifndef FFMPEG_RV34_H -#define FFMPEG_RV34_H +#ifndef AVCODEC_RV34_H +#define AVCODEC_RV34_H #include "avcodec.h" #include "dsputil.h" @@ -122,4 +122,4 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size); int ff_rv34_decode_end(AVCodecContext *avctx); -#endif /* FFMPEG_RV34_H */ +#endif /* AVCODEC_RV34_H */
--- a/rv34data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv34data.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * miscellaneous RV30/40 tables */ -#ifndef FFMPEG_RV34DATA_H -#define FFMPEG_RV34DATA_H +#ifndef AVCODEC_RV34DATA_H +#define AVCODEC_RV34DATA_H #include <stdint.h> @@ -145,4 +145,4 @@ */ static const uint8_t rv34_mb_bits_sizes[6] = { 6, 7, 9, 11, 13, 14 }; -#endif /* FFMPEG_RV34DATA_H */ +#endif /* AVCODEC_RV34DATA_H */
--- a/rv34vlc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv34vlc.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * RV30/40 VLC tables */ -#ifndef FFMPEG_RV34VLC_H -#define FFMPEG_RV34VLC_H +#ifndef AVCODEC_RV34VLC_H +#define AVCODEC_RV34VLC_H #include <stdint.h> @@ -4051,4 +4051,4 @@ } }; -#endif /* FFMPEG_RV34VLC_H */ +#endif /* AVCODEC_RV34VLC_H */
--- a/rv40data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv40data.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * miscellaneous RV40 tables */ -#ifndef FFMPEG_RV40DATA_H -#define FFMPEG_RV40DATA_H +#ifndef AVCODEC_RV40DATA_H +#define AVCODEC_RV40DATA_H #include <stdint.h> @@ -112,4 +112,4 @@ }; /** @} */ // end loopfilter group -#endif /* FFMPEG_RV40DATA_H */ +#endif /* AVCODEC_RV40DATA_H */
--- a/rv40vlc2.h Sun Aug 31 07:05:55 2008 +0000 +++ b/rv40vlc2.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * RV40 VLC tables used for macroblock information decoding */ -#ifndef FFMPEG_RV40VLC2_H -#define FFMPEG_RV40VLC2_H +#ifndef AVCODEC_RV40VLC2_H +#define AVCODEC_RV40VLC2_H #include <stdint.h> @@ -703,4 +703,4 @@ 0, 1, 0, 0, 2, 3, 0, 5, 0, 0, 4, 0 }; //@} -#endif /* FFMPEG_RV40VLC2_H */ +#endif /* AVCODEC_RV40VLC2_H */
--- a/s3tc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/s3tc.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_S3TC_H -#define FFMPEG_S3TC_H +#ifndef AVCODEC_S3TC_H +#define AVCODEC_S3TC_H #include <stdint.h> @@ -50,4 +50,4 @@ const unsigned int w, const unsigned int h, const unsigned int stride); -#endif /* FFMPEG_S3TC_H */ +#endif /* AVCODEC_S3TC_H */
--- a/sgi.h Sun Aug 31 07:05:55 2008 +0000 +++ b/sgi.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SGI_H -#define FFMPEG_SGI_H +#ifndef AVCODEC_SGI_H +#define AVCODEC_SGI_H /** * SGI image file signature @@ -33,4 +33,4 @@ #define SGI_RGB 3 #define SGI_RGBA 4 -#endif /* FFMPEG_SGI_H */ +#endif /* AVCODEC_SGI_H */
--- a/simple_idct.h Sun Aug 31 07:05:55 2008 +0000 +++ b/simple_idct.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * simple idct header. */ -#ifndef FFMPEG_SIMPLE_IDCT_H -#define FFMPEG_SIMPLE_IDCT_H +#ifndef AVCODEC_SIMPLE_IDCT_H +#define AVCODEC_SIMPLE_IDCT_H #include <stdint.h> #include "dsputil.h" @@ -44,4 +44,4 @@ void ff_simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct44_add(uint8_t *dest, int line_size, DCTELEM *block); -#endif /* FFMPEG_SIMPLE_IDCT_H */ +#endif /* AVCODEC_SIMPLE_IDCT_H */
--- a/snow.h Sun Aug 31 07:05:55 2008 +0000 +++ b/snow.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SNOW_H -#define FFMPEG_SNOW_H +#ifndef AVCODEC_SNOW_H +#define AVCODEC_SNOW_H #include "dsputil.h" @@ -171,4 +171,4 @@ } } -#endif /* FFMPEG_SNOW_H */ +#endif /* AVCODEC_SNOW_H */
--- a/sp5x.h Sun Aug 31 07:05:55 2008 +0000 +++ b/sp5x.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SP5X_H -#define FFMPEG_SP5X_H +#ifndef AVCODEC_SP5X_H +#define AVCODEC_SP5X_H #include <stdint.h> @@ -331,4 +331,4 @@ }; #endif -#endif /* FFMPEG_SP5X_H */ +#endif /* AVCODEC_SP5X_H */
--- a/sparc/vis.h Sun Aug 31 07:05:55 2008 +0000 +++ b/sparc/vis.h Sun Aug 31 07:39:47 2008 +0000 @@ -40,8 +40,8 @@ * the assembler to keep the binary from becoming tainted. */ -#ifndef FFMPEG_VIS_H -#define FFMPEG_VIS_H +#ifndef AVCODEC_SPARC_VIS_H +#define AVCODEC_SPARC_VIS_H #define vis_opc_base ((0x1 << 31) | (0x36 << 19)) #define vis_opf(X) ((X) << 5) @@ -329,4 +329,4 @@ #define vis_pdist(rs1,rs2,rd) vis_dd2d(0x3e, rs1, rs2, rd) -#endif /* FFMPEG_VIS_H */ +#endif /* AVCODEC_SPARC_VIS_H */
--- a/svq1.h Sun Aug 31 07:05:55 2008 +0000 +++ b/svq1.h Sun Aug 31 07:39:47 2008 +0000 @@ -32,8 +32,8 @@ * http://www.pcisys.net/~melanson/codecs/ */ -#ifndef FFMPEG_SVQ1_H -#define FFMPEG_SVQ1_H +#ifndef AVCODEC_SVQ1_H +#define AVCODEC_SVQ1_H #include <stdint.h> @@ -58,4 +58,4 @@ extern const svq1_frame_size_t ff_svq1_frame_size_table[8]; -#endif /* FFMPEG_SVQ1_H */ +#endif /* AVCODEC_SVQ1_H */
--- a/svq1_cb.h Sun Aug 31 07:05:55 2008 +0000 +++ b/svq1_cb.h Sun Aug 31 07:39:47 2008 +0000 @@ -28,8 +28,8 @@ * svq1 code books. */ -#ifndef FFMPEG_SVQ1_CB_H -#define FFMPEG_SVQ1_CB_H +#ifndef AVCODEC_SVQ1_CB_H +#define AVCODEC_SVQ1_CB_H #include <stdint.h> #include <stdlib.h> @@ -1520,4 +1520,4 @@ NULL, NULL, }; -#endif /* FFMPEG_SVQ1_CB_H */ +#endif /* AVCODEC_SVQ1_CB_H */
--- a/svq1_vlc.h Sun Aug 31 07:05:55 2008 +0000 +++ b/svq1_vlc.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_SVQ1_VLC_H -#define FFMPEG_SVQ1_VLC_H +#ifndef AVCODEC_SVQ1_VLC_H +#define AVCODEC_SVQ1_VLC_H #include <stdint.h> @@ -280,4 +280,4 @@ { 0x3, 22 }, { 0x2, 22 }, { 0x1, 22 }, { 0x0, 22 } }; -#endif /* FFMPEG_SVQ1_VLC_H */ +#endif /* AVCODEC_SVQ1_VLC_H */
--- a/svq1enc_cb.h Sun Aug 31 07:05:55 2008 +0000 +++ b/svq1enc_cb.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * svq1 code books. */ -#ifndef FFMPEG_SVQ1ENC_CB_H -#define FFMPEG_SVQ1ENC_CB_H +#ifndef AVCODEC_SVQ1ENC_CB_H +#define AVCODEC_SVQ1ENC_CB_H #include <stdint.h> @@ -93,4 +93,4 @@ } }; -#endif /* FFMPEG_SVQ1ENC_CB_H */ +#endif /* AVCODEC_SVQ1ENC_CB_H */
--- a/tiff.h Sun Aug 31 07:05:55 2008 +0000 +++ b/tiff.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * @file tiff.h * @author Konstantin Shishkov */ -#ifndef FFMPEG_TIFF_H -#define FFMPEG_TIFF_H +#ifndef AVCODEC_TIFF_H +#define AVCODEC_TIFF_H #include <stdint.h> @@ -83,4 +83,4 @@ 0, 1, 100, 2, 4, 8 }; -#endif /* FFMPEG_TIFF_H */ +#endif /* AVCODEC_TIFF_H */
--- a/truemotion1data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/truemotion1data.h Sun Aug 31 07:39:47 2008 +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 FFMPEG_TRUEMOTION1DATA_H -#define FFMPEG_TRUEMOTION1DATA_H +#ifndef AVCODEC_TRUEMOTION1DATA_H +#define AVCODEC_TRUEMOTION1DATA_H #include <stdint.h> #include <stdlib.h> @@ -830,4 +830,4 @@ static const uint8_t * const tables[] = { pc_tbl2, pc_tbl3, pc_tbl4 }; -#endif /* FFMPEG_TRUEMOTION1DATA_H */ +#endif /* AVCODEC_TRUEMOTION1DATA_H */
--- a/truespeech_data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/truespeech_data.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_TRUESPEECH_DATA_H -#define FFMPEG_TRUESPEECH_DATA_H +#ifndef AVCODEC_TRUESPEECH_DATA_H +#define AVCODEC_TRUESPEECH_DATA_H #include <stdint.h> @@ -156,4 +156,4 @@ static const int16_t ts_5F2[8] = { 0x6000, 0x4800, 0x3600, 0x2880, 0x1E60, 0x16C8, 0x1116, 0x0CD1 }; -#endif /* FFMPEG_TRUESPEECH_DATA_H */ +#endif /* AVCODEC_TRUESPEECH_DATA_H */
--- a/ulti_cb.h Sun Aug 31 07:05:55 2008 +0000 +++ b/ulti_cb.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_ULTI_CB_H -#define FFMPEG_ULTI_CB_H +#ifndef AVCODEC_ULTI_CB_H +#define AVCODEC_ULTI_CB_H static const unsigned char ulti_codebook[16384]={ 0x00, 0x01, 0x01, 0x02, @@ -4121,4 +4121,4 @@ 0x3D, 0x3E, 0x3E, 0x3F }; -#endif /* FFMPEG_ULTI_CB_H */ +#endif /* AVCODEC_ULTI_CB_H */
--- a/unary.h Sun Aug 31 07:05:55 2008 +0000 +++ b/unary.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_UNARY_H -#define FFMPEG_UNARY_H +#ifndef AVCODEC_UNARY_H +#define AVCODEC_UNARY_H #include "bitstream.h" @@ -53,4 +53,4 @@ return get_unary(gb, 0, 9); } -#endif /* FFMPEG_UNARY_H */ +#endif /* AVCODEC_UNARY_H */
--- a/vc1.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vc1.h Sun Aug 31 07:39:47 2008 +0000 @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VC1_H -#define FFMPEG_VC1_H +#ifndef AVCODEC_VC1_H +#define AVCODEC_VC1_H #include "avcodec.h" #include "mpegvideo.h" @@ -308,4 +308,4 @@ uint32_t *cbp_base, *cbp; } VC1Context; -#endif /* FFMPEG_VC1_H */ +#endif /* AVCODEC_VC1_H */
--- a/vc1acdata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vc1acdata.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VC1ACDATA_H -#define FFMPEG_VC1ACDATA_H +#ifndef AVCODEC_VC1ACDATA_H +#define AVCODEC_VC1ACDATA_H #include <stdint.h> @@ -589,4 +589,4 @@ } }; -#endif /* FFMPEG_VC1ACDATA_H */ +#endif /* AVCODEC_VC1ACDATA_H */
--- a/vc1data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vc1data.h Sun Aug 31 07:39:47 2008 +0000 @@ -25,8 +25,8 @@ * VC-1 tables. */ -#ifndef FFMPEG_VC1DATA_H -#define FFMPEG_VC1DATA_H +#ifndef AVCODEC_VC1DATA_H +#define AVCODEC_VC1DATA_H #include <stdint.h> #include "libavutil/rational.h" @@ -154,4 +154,4 @@ /* DQScale as specified in 8.1.3.9 - almost identical to 0x40000/i */ extern const int32_t ff_vc1_dqscale[63]; -#endif /* FFMPEG_VC1DATA_H */ +#endif /* AVCODEC_VC1DATA_H */
--- a/vorbis.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vorbis.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VORBIS_H -#define FFMPEG_VORBIS_H +#ifndef AVCODEC_VORBIS_H +#define AVCODEC_VORBIS_H #include "avcodec.h" @@ -40,4 +40,4 @@ #define ilog(i) av_log2(2*(i)) -#endif /* FFMPEG_VORBIS_H */ +#endif /* AVCODEC_VORBIS_H */
--- a/vorbis_enc_data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vorbis_enc_data.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VORBIS_ENC_DATA_H -#define FFMPEG_VORBIS_ENC_DATA_H +#ifndef AVCODEC_VORBIS_ENC_DATA_H +#define AVCODEC_VORBIS_ENC_DATA_H #include <stdint.h> @@ -502,4 +502,4 @@ { 3, 2, 3, (const int[]){ -1, 12, 13, 14 } }, }; -#endif /* FFMPEG_VORBIS_ENC_DATA_H */ +#endif /* AVCODEC_VORBIS_ENC_DATA_H */
--- a/vp3data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vp3data.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP3DATA_H -#define FFMPEG_VP3DATA_H +#ifndef AVCODEC_VP3DATA_H +#define AVCODEC_VP3DATA_H #include <stdint.h> #include <stdlib.h> @@ -3178,4 +3178,4 @@ } }; -#endif /* FFMPEG_VP3DATA_H */ +#endif /* AVCODEC_VP3DATA_H */
--- a/vp56.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vp56.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP56_H -#define FFMPEG_VP56_H +#ifndef AVCODEC_VP56_H +#define AVCODEC_VP56_H #include "vp56data.h" #include "dsputil.h" @@ -265,4 +265,4 @@ return -tree->val; } -#endif /* FFMPEG_VP56_H */ +#endif /* AVCODEC_VP56_H */
--- a/vp56data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vp56data.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP56DATA_H -#define FFMPEG_VP56DATA_H +#ifndef AVCODEC_VP56DATA_H +#define AVCODEC_VP56DATA_H #include "libavutil/common.h" @@ -249,4 +249,4 @@ { 2, -2 }, }; -#endif /* FFMPEG_VP56DATA_H */ +#endif /* AVCODEC_VP56DATA_H */
--- a/vp5data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vp5data.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP5DATA_H -#define FFMPEG_VP5DATA_H +#ifndef AVCODEC_VP5DATA_H +#define AVCODEC_VP5DATA_H #include <stdint.h> @@ -172,4 +172,4 @@ static const uint8_t vp5_coord_div[] = { 2, 2, 2, 2, 4, 4 }; -#endif /* FFMPEG_VP5DATA_H */ +#endif /* AVCODEC_VP5DATA_H */
--- a/vp6data.h Sun Aug 31 07:05:55 2008 +0000 +++ b/vp6data.h Sun Aug 31 07:39:47 2008 +0000 @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_VP6DATA_H -#define FFMPEG_VP6DATA_H +#ifndef AVCODEC_VP6DATA_H +#define AVCODEC_VP6DATA_H #include "vp56data.h" @@ -305,4 +305,4 @@ 10, 13, 11, 12, 0, 1, 2, 3, 14, 8, 15, 16, 4, 5, 6, 7 }; -#endif /* FFMPEG_VP6DATA_H */ +#endif /* AVCODEC_VP6DATA_H */
--- a/wma.h Sun Aug 31 07:05:55 2008 +0000 +++ b/wma.h Sun Aug 31 07:39:47 2008 +0000 @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_WMA_H -#define FFMPEG_WMA_H +#ifndef AVCODEC_WMA_H +#define AVCODEC_WMA_H #include "bitstream.h" #include "dsputil.h" @@ -146,4 +146,4 @@ int ff_wma_total_gain_to_bits(int total_gain); int ff_wma_end(AVCodecContext *avctx); -#endif /* FFMPEG_WMA_H */ +#endif /* AVCODEC_WMA_H */
--- a/wmadata.h Sun Aug 31 07:05:55 2008 +0000 +++ b/wmadata.h Sun Aug 31 07:39:47 2008 +0000 @@ -24,8 +24,8 @@ * Various WMA tables. */ -#ifndef FFMPEG_WMADATA_H -#define FFMPEG_WMADATA_H +#ifndef AVCODEC_WMADATA_H +#define AVCODEC_WMADATA_H #include <stdint.h> #include "wma.h" @@ -1438,4 +1438,4 @@ }, }; -#endif /* FFMPEG_WMADATA_H */ +#endif /* AVCODEC_WMADATA_H */
--- a/wmv2.h Sun Aug 31 07:05:55 2008 +0000 +++ b/wmv2.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_WMV2_H -#define FFMPEG_WMV2_H +#ifndef AVCODEC_WMV2_H +#define AVCODEC_WMV2_H #include "avcodec.h" #include "dsputil.h" @@ -55,4 +55,4 @@ void ff_wmv2_common_init(Wmv2Context * w); -#endif /* FFMPEG_WMV2_H */ +#endif /* AVCODEC_WMV2_H */
--- a/xiph.h Sun Aug 31 07:05:55 2008 +0000 +++ b/xiph.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_XIPH_H -#define FFMPEG_XIPH_H +#ifndef AVCODEC_XIPH_H +#define AVCODEC_XIPH_H #include "libavutil/common.h" @@ -40,4 +40,4 @@ int first_header_size, uint8_t *header_start[3], int header_len[3]); -#endif /* FFMPEG_XIPH_H */ +#endif /* AVCODEC_XIPH_H */
--- a/xvmc_render.h Sun Aug 31 07:05:55 2008 +0000 +++ b/xvmc_render.h Sun Aug 31 07:39:47 2008 +0000 @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FFMPEG_XVMC_RENDER_H -#define FFMPEG_XVMC_RENDER_H +#ifndef AVCODEC_XVMC_RENDER_H +#define AVCODEC_XVMC_RENDER_H #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -72,4 +72,4 @@ } xvmc_render_state_t; -#endif /* FFMPEG_XVMC_RENDER_H */ +#endif /* AVCODEC_XVMC_RENDER_H */