Globally rename the header inclusion guard names.

Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago · 987903826b
parent f031938343
commit 987903826b
238 changed files with 713 additions and 713 deletions
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@ -27,8 +27,8 @@
 * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
 */

-#ifndef FFMPEG_AAC_H
-#define FFMPEG_AAC_H
+#ifndef AVCODEC_AAC_H
+#define AVCODEC_AAC_H

 #include "avcodec.h"
 #include "dsputil.h"
@ -272,4 +272,4 @@ typedef struct {

 } AACContext;

-#endif /* FFMPEG_AAC_H */
+#endif /* AVCODEC_AAC_H */
--- a/libavcodec/aac_ac3_parser.h
+++ b/libavcodec/aac_ac3_parser.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AAC_AC3_PARSER_H
-#define FFMPEG_AAC_AC3_PARSER_H
+#ifndef AVCODEC_AAC_AC3_PARSER_H
+#define AVCODEC_AAC_AC3_PARSER_H

 #include <stdint.h>
 #include "avcodec.h"
@ -50,4 +50,4 @@ int ff_aac_ac3_parse(AVCodecParserContext *s1,
                     const uint8_t **poutbuf, int *poutbuf_size,
                     const uint8_t *buf, int buf_size);

-#endif /* FFMPEG_AAC_AC3_PARSER_H */
+#endif /* AVCODEC_AAC_AC3_PARSER_H */
--- a/libavcodec/aacdectab.h
+++ b/libavcodec/aacdectab.h
@ -27,8 +27,8 @@
 * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
 */

-#ifndef FFMPEG_AACDECTAB_H
-#define FFMPEG_AACDECTAB_H
+#ifndef AVCODEC_AACDECTAB_H
+#define AVCODEC_AACDECTAB_H

 #include "aac.h"

@ -206,4 +206,4 @@ static const float *tns_tmp2_map[4] = {
 };
 // @}

-#endif /* FFMPEG_AACDECTAB_H */
+#endif /* AVCODEC_AACDECTAB_H */
--- a/libavcodec/aacpsy.h
+++ b/libavcodec/aacpsy.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AACPSY_H
-#define FFMPEG_AACPSY_H
+#ifndef AVCODEC_AACPSY_H
+#define AVCODEC_AACPSY_H

 #include "avcodec.h"
 #include "aac.h"
@ -47,4 +47,4 @@ typedef struct AACPsyContext {
 */
 void ff_aac_psy_end(AACPsyContext *ctx);

-#endif /* FFMPEG_AACPSY_H */
+#endif /* AVCODEC_AACPSY_H */
--- a/libavcodec/aactab.h
+++ b/libavcodec/aactab.h
@ -27,8 +27,8 @@
 * @author Maxim Gavrilov ( maxim.gavrilov gmail com )
 */

-#ifndef FFMPEG_AACTAB_H
-#define FFMPEG_AACTAB_H
+#ifndef AVCODEC_AACTAB_H
+#define AVCODEC_AACTAB_H

 #include "libavutil/mem.h"
 #include "aac.h"
@ -69,4 +69,4 @@ extern const float ff_aac_pow2sf_tab[316];
 extern       float ff_aac_pow2sf_tab[316];
 #endif /* CONFIG_HARDCODED_TABLES */

-#endif /* FFMPEG_AACTAB_H */
+#endif /* AVCODEC_AACTAB_H */
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@ -24,8 +24,8 @@
 * Common code between the AC-3 encoder and decoder.
 */

-#ifndef FFMPEG_AC3_H
-#define FFMPEG_AC3_H
+#ifndef AVCODEC_AC3_H
+#define AVCODEC_AC3_H

 #include "ac3tab.h"

@ -182,4 +182,4 @@ void ac3_parametric_bit_allocation(AC3BitAllocParameters *s, uint8_t *bap,
                                   uint8_t *dba_offsets, uint8_t *dba_lengths,
                                   uint8_t *dba_values);

-#endif /* FFMPEG_AC3_H */
+#endif /* AVCODEC_AC3_H */
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AC3_PARSER_H
-#define FFMPEG_AC3_PARSER_H
+#ifndef AVCODEC_AC3_PARSER_H
+#define AVCODEC_AC3_PARSER_H

 #include "ac3.h"
 #include "bitstream.h"
@ -58,4 +58,4 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr);
 */
 int ff_ac3_parse_header_full(GetBitContext *gbc, AC3HeaderInfo *hdr);

-#endif /* FFMPEG_AC3_PARSER_H */
+#endif /* AVCODEC_AC3_PARSER_H */
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@ -24,8 +24,8 @@
 * Common code between the AC-3 and E-AC-3 decoders.
 */

-#ifndef FFMPEG_AC3DEC_H
-#define FFMPEG_AC3DEC_H
+#ifndef AVCODEC_AC3DEC_H
+#define AVCODEC_AC3DEC_H

 #include "libavutil/lfg.h"
 #include "ac3.h"
@ -179,4 +179,4 @@ int ff_eac3_parse_header(AC3DecodeContext *s);
 */
 void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch);

-#endif /* FFMPEG_AC3DEC_H */
+#endif /* AVCODEC_AC3DEC_H */
--- a/libavcodec/ac3dec_data.h
+++ b/libavcodec/ac3dec_data.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AC3DEC_DATA_H
-#define FFMPEG_AC3DEC_DATA_H
+#ifndef AVCODEC_AC3DEC_DATA_H
+#define AVCODEC_AC3DEC_DATA_H

 #include "libavutil/common.h"

@ -37,4 +37,4 @@ extern const uint8_t ff_eac3_default_cpl_band_struct[18];

 extern const uint8_t ff_ac3_rematrix_band_tab[5];

-#endif /* FFMPEG_AC3DEC_DATA_H */
+#endif /* AVCODEC_AC3DEC_DATA_H */
--- a/libavcodec/ac3tab.h
+++ b/libavcodec/ac3tab.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AC3TAB_H
-#define FFMPEG_AC3TAB_H
+#ifndef AVCODEC_AC3TAB_H
+#define AVCODEC_AC3TAB_H

 #include "libavutil/common.h"

@ -56,4 +56,4 @@ enum CustomChannelMapLocation{
    AC3_CHMAP_LFE =     1<<(15-15)
 };

-#endif /* FFMPEG_AC3TAB_H */
+#endif /* AVCODEC_AC3TAB_H */
--- a/libavcodec/acelp_filters.h
+++ b/libavcodec/acelp_filters.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ACELP_FILTERS_H
-#define FFMPEG_ACELP_FILTERS_H
+#ifndef AVCODEC_ACELP_FILTERS_H
+#define AVCODEC_ACELP_FILTERS_H

 #include <stdint.h>

@ -134,4 +134,4 @@ void ff_acelp_high_pass_filter(
        const int16_t* in,
        int length);

-#endif /* FFMPEG_ACELP_FILTERS_H */
+#endif /* AVCODEC_ACELP_FILTERS_H */
--- a/libavcodec/acelp_math.h
+++ b/libavcodec/acelp_math.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ACELP_MATH_H
-#define FFMPEG_ACELP_MATH_H
+#ifndef AVCODEC_ACELP_MATH_H
+#define AVCODEC_ACELP_MATH_H

 #include <stdint.h>

@ -83,4 +83,4 @@ static inline int bidir_sal(int value, int offset)
    else           return value <<  offset;
 }

-#endif /* FFMPEG_ACELP_MATH_H */
+#endif /* AVCODEC_ACELP_MATH_H */
--- a/libavcodec/acelp_pitch_delay.h
+++ b/libavcodec/acelp_pitch_delay.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ACELP_PITCH_DELAY_H
-#define FFMPEG_ACELP_PITCH_DELAY_H
+#ifndef AVCODEC_ACELP_PITCH_DELAY_H
+#define AVCODEC_ACELP_PITCH_DELAY_H

 #include <stdint.h>

@ -217,4 +217,4 @@ int16_t ff_acelp_decode_gain_code(
    int subframe_size,
    int max_pred_order);

-#endif /* FFMPEG_ACELP_PITCH_DELAY_H */
+#endif /* AVCODEC_ACELP_PITCH_DELAY_H */
--- a/libavcodec/acelp_vectors.h
+++ b/libavcodec/acelp_vectors.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ACELP_VECTORS_H
-#define FFMPEG_ACELP_VECTORS_H
+#ifndef AVCODEC_ACELP_VECTORS_H
+#define AVCODEC_ACELP_VECTORS_H

 #include <stdint.h>

@ -150,4 +150,4 @@ void ff_acelp_weighted_vector_sum(
        int shift,
        int length);

-#endif /* FFMPEG_ACELP_VECTORS_H */
+#endif /* AVCODEC_ACELP_VECTORS_H */
--- a/libavcodec/adx.h
+++ b/libavcodec/adx.h
@ -28,8 +28,8 @@
 * adx2wav & wav2adx http://www.geocities.co.jp/Playtown/2004/
 */

-#ifndef FFMPEG_ADX_H
-#define FFMPEG_ADX_H
+#ifndef AVCODEC_ADX_H
+#define AVCODEC_ADX_H

 typedef struct {
    int s1,s2;
@ -46,4 +46,4 @@ typedef struct {
 #define    SCALE1    0x7298
 #define    SCALE2    0x3350

-#endif /* FFMPEG_ADX_H */
+#endif /* AVCODEC_ADX_H */
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ASM_H
-#define FFMPEG_ASM_H
+#ifndef AVCODEC_ALPHA_ASM_H
+#define AVCODEC_ALPHA_ASM_H

 #include <inttypes.h>

@ -188,4 +188,4 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
 #error "Unknown compiler!"
 #endif

-#endif /* FFMPEG_ASM_H */
+#endif /* AVCODEC_ALPHA_ASM_H */
--- a/libavcodec/alpha/regdef.h
+++ b/libavcodec/alpha/regdef.h
@ -20,8 +20,8 @@
 */

 /* Some BSDs don't seem to have regdef.h... sigh  */
-#ifndef FFMPEG_REGDEF_H
-#define FFMPEG_REGDEF_H
+#ifndef AVCODEC_ALPHA_REGDEF_H
+#define AVCODEC_ALPHA_REGDEF_H

 #define v0      $0      /* function return value */

@ -63,4 +63,4 @@
 #define sp      $30     /* stack pointer */
 #define zero    $31     /* reads as zero, writes are noops */

-#endif /* FFMPEG_REGDEF_H */
+#endif /* AVCODEC_ALPHA_REGDEF_H */
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ARMV4L_MATHOPS_H
-#define FFMPEG_ARMV4L_MATHOPS_H
+#ifndef AVCODEC_ARMV4L_MATHOPS_H
+#define AVCODEC_ARMV4L_MATHOPS_H

 #ifdef FRAC_BITS
 #   define MULL(a, b) \
@ -80,4 +80,4 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b)

 #endif

-#endif /* FFMPEG_ARMV4L_MATHOPS_H */
+#endif /* AVCODEC_ARMV4L_MATHOPS_H */
--- a/libavcodec/atrac3data.h
+++ b/libavcodec/atrac3data.h
@ -25,8 +25,8 @@
 * Atrac 3 AKA RealAudio 8 compatible decoder data
 */

-#ifndef FFMPEG_ATRAC3DATA_H
-#define FFMPEG_ATRAC3DATA_H
+#ifndef AVCODEC_ATRAC3DATA_H
+#define AVCODEC_ATRAC3DATA_H

 #include <stdint.h>

@ -137,4 +137,4 @@ static const float qmf_48tap_half[24] = {
 /* joint stereo related tables */
 static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};

-#endif /* FFMPEG_ATRAC3DATA_H */
+#endif /* AVCODEC_ATRAC3DATA_H */
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AUDIOCONVERT_H
-#define FFMPEG_AUDIOCONVERT_H
+#ifndef AVCODEC_AUDIOCONVERT_H
+#define AVCODEC_AUDIOCONVERT_H

 /**
 * @file audioconvert.h
@ -88,4 +88,4 @@ int av_audio_convert(AVAudioConvert *ctx,
                           void * const out[6], const int out_stride[6],
                     const void * const  in[6], const int  in_stride[6], int len);

-#endif /* FFMPEG_AUDIOCONVERT_H */
+#endif /* AVCODEC_AUDIOCONVERT_H */
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -18,8 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_AVCODEC_H
-#define FFMPEG_AVCODEC_H
+#ifndef AVCODEC_AVCODEC_H
+#define AVCODEC_AVCODEC_H

 /**
 * @file avcodec.h
@ -3074,4 +3074,4 @@ void av_log_missing_feature(void *avc, const char *feature, int want_sample);
 #define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
 #define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */

-#endif /* FFMPEG_AVCODEC_H */
+#endif /* AVCODEC_AVCODEC_H */
--- a/libavcodec/bethsoftvideo.h
+++ b/libavcodec/bethsoftvideo.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_BETHSOFTVIDEO_H
-#define FFMPEG_BETHSOFTVIDEO_H
+#ifndef AVCODEC_BETHSOFTVIDEO_H
+#define AVCODEC_BETHSOFTVIDEO_H

 enum BethsoftVidBlockType
 {
@ -33,4 +33,4 @@ enum BethsoftVidBlockType
    EOF_BLOCK           = 0x14,
 };

-#endif /* FFMPEG_BETHSOFTVIDEO_H */
+#endif /* AVCODEC_BETHSOFTVIDEO_H */
--- a/libavcodec/bfin/config_bfin.h
+++ b/libavcodec/bfin/config_bfin.h
@ -30,8 +30,8 @@ DEFUN(put_pixels_clamped,mL1,
      rts;
 */

-#ifndef FFMPEG_CONFIG_BFIN_H
-#define FFMPEG_CONFIG_BFIN_H
+#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
+#define AVCODEC_BFIN_CONFIG_BFIN_H

 #ifndef DEFUN

@ -62,4 +62,4 @@ DEFUN(put_pixels_clamped,mL1,

 #endif

-#endif /* FFMPEG_CONFIG_BFIN_H */
+#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */
--- a/libavcodec/bfin/dsputil_bfin.h
+++ b/libavcodec/bfin/dsputil_bfin.h
@ -21,8 +21,8 @@
 */


-#ifndef FFMPEG_DSPUTIL_BFIN_H
-#define FFMPEG_DSPUTIL_BFIN_H
+#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H
+#define AVCODEC_BFIN_DSPUTIL_BFIN_H

 #ifdef __FDPIC__
 #define attribute_l1_text  __attribute__ ((l1_text))
@ -71,4 +71,4 @@ static void bfprof (void)
 #define bfprof()
 #endif

-#endif /* FFMPEG_DSPUTIL_BFIN_H */
+#endif /* AVCODEC_BFIN_DSPUTIL_BFIN_H */
--- a/libavcodec/bfin/mathops.h
+++ b/libavcodec/bfin/mathops.h
@ -19,8 +19,8 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#ifndef 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/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@ -23,8 +23,8 @@
 * bitstream api header.
 */

-#ifndef FFMPEG_BITSTREAM_H
-#define FFMPEG_BITSTREAM_H
+#ifndef AVCODEC_BITSTREAM_H
+#define AVCODEC_BITSTREAM_H

 #include <stdint.h>
 #include <stdlib.h>
@ -954,4 +954,4 @@ static inline int decode210(GetBitContext *gb){
        return 2 - get_bits1(gb);
 }

-#endif /* FFMPEG_BITSTREAM_H */
+#endif /* AVCODEC_BITSTREAM_H */
--- a/libavcodec/bmp.h
+++ b/libavcodec/bmp.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_BMP_H
-#define FFMPEG_BMP_H
+#ifndef AVCODEC_BMP_H
+#define AVCODEC_BMP_H

 #include "avcodec.h"

@ -35,4 +35,4 @@ typedef enum {
    BMP_BITFIELDS   =3,
 } BiCompression;

-#endif /* FFMPEG_BMP_H */
+#endif /* AVCODEC_BMP_H */
--- a/libavcodec/bytestream.h
+++ b/libavcodec/bytestream.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_BYTESTREAM_H
-#define FFMPEG_BYTESTREAM_H
+#ifndef AVCODEC_BYTESTREAM_H
+#define AVCODEC_BYTESTREAM_H

 #include "libavutil/common.h"

@ -66,4 +66,4 @@ static av_always_inline void bytestream_put_buffer(uint8_t **b, const uint8_t *s
    (*b) += size;
 }

-#endif /* FFMPEG_BYTESTREAM_H */
+#endif /* AVCODEC_BYTESTREAM_H */
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@ -24,8 +24,8 @@
 * Context Adaptive Binary Arithmetic Coder.
 */

-#ifndef FFMPEG_CABAC_H
-#define FFMPEG_CABAC_H
+#ifndef AVCODEC_CABAC_H
+#define AVCODEC_CABAC_H

 #include "bitstream.h"

@ -757,4 +757,4 @@ static int get_cabac_ueg(CABACContext *c, uint8_t * state, int max, int is_signe
 }
 #endif /* 0 */

-#endif /* FFMPEG_CABAC_H */
+#endif /* AVCODEC_CABAC_H */
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_CAVS_H
-#define FFMPEG_CAVS_H
+#ifndef AVCODEC_CAVS_H
+#define AVCODEC_CAVS_H

 #include "dsputil.h"
 #include "mpegvideo.h"
@ -311,4 +311,4 @@ void ff_cavs_init_top_lines(AVSContext *h);
 int ff_cavs_init(AVCodecContext *avctx);
 int ff_cavs_end (AVCodecContext *avctx);

-#endif /* FFMPEG_CAVS_H */
+#endif /* AVCODEC_CAVS_H */
--- a/libavcodec/cavsdata.h
+++ b/libavcodec/cavsdata.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_CAVSDATA_H
-#define FFMPEG_CAVSDATA_H
+#ifndef AVCODEC_CAVSDATA_H
+#define AVCODEC_CAVSDATA_H

 #include "cavs.h"

@ -502,4 +502,4 @@ const int_fast8_t ff_top_modifier_l[8]  = {-1, 1, 5,-1,-1, 5, 7, 7};
 const int_fast8_t ff_left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
 const int_fast8_t ff_top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};

-#endif /* FFMPEG_CAVSDATA_H */
+#endif /* AVCODEC_CAVSDATA_H */
--- a/libavcodec/colorspace.h
+++ b/libavcodec/colorspace.h
@ -24,8 +24,8 @@
 * Various defines for YUV<->RGB conversion
 */

-#ifndef FFMPEG_COLORSPACE_H
-#define FFMPEG_COLORSPACE_H
+#ifndef AVCODEC_COLORSPACE_H
+#define AVCODEC_COLORSPACE_H

 #define SCALEBITS 10
 #define ONE_HALF  (1 << (SCALEBITS - 1))
@ -108,4 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) {
 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 -           \
   FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)

-#endif /* FFMPEG_COLORSPACE_H */
+#endif /* AVCODEC_COLORSPACE_H */
--- a/libavcodec/cookdata.h
+++ b/libavcodec/cookdata.h
@ -25,8 +25,8 @@
 * Cook AKA RealAudio G2 compatible decoderdata
 */

-#ifndef FFMPEG_COOKDATA_H
-#define FFMPEG_COOKDATA_H
+#ifndef AVCODEC_COOKDATA_H
+#define AVCODEC_COOKDATA_H

 #include <stdint.h>

@ -560,4 +560,4 @@ static const float* const cplscales[5] = {
    cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
 };

-#endif /* FFMPEG_COOKDATA_H */
+#endif /* AVCODEC_COOKDATA_H */
--- a/libavcodec/dca.h
+++ b/libavcodec/dca.h
@ -22,8 +22,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_DCA_H
-#define FFMPEG_DCA_H
+#ifndef AVCODEC_DCA_H
+#define AVCODEC_DCA_H

 /** DCA syncwords, also used for bitstream type detection */
 #define DCA_MARKER_RAW_BE 0x7FFE8001
@ -31,4 +31,4 @@
 #define DCA_MARKER_14B_BE 0x1FFFE800
 #define DCA_MARKER_14B_LE 0xFF1F00E8

-#endif /* FFMPEG_DCA_H */
+#endif /* AVCODEC_DCA_H */
--- a/libavcodec/dcadata.h
+++ b/libavcodec/dcadata.h
@ -24,8 +24,8 @@
 * @file dcadata.c
 */

-#ifndef FFMPEG_DCADATA_H
-#define FFMPEG_DCADATA_H
+#ifndef AVCODEC_DCADATA_H
+#define AVCODEC_DCADATA_H

 #include <stdint.h>

@ -8471,4 +8471,4 @@ where Ch(n) represents the subband samples in the (n)th audio channel.

 */

-#endif /* FFMPEG_DCADATA_H */
+#endif /* AVCODEC_DCADATA_H */
--- a/libavcodec/dcahuff.h
+++ b/libavcodec/dcahuff.h
@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_DCAHUFF_H
-#define FFMPEG_DCAHUFF_H
+#ifndef AVCODEC_DCAHUFF_H
+#define AVCODEC_DCAHUFF_H

 #include <stdint.h>
 #include <stdlib.h>
@ -1073,4 +1073,4 @@ static const uint8_t* const bitalloc_bits[10][8] = {
    bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
 };

-#endif /* FFMPEG_DCAHUFF_H */
+#endif /* AVCODEC_DCAHUFF_H */
--- a/libavcodec/dnxhddata.h
+++ b/libavcodec/dnxhddata.h
@ -19,8 +19,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_DNXHDDATA_H
-#define FFMPEG_DNXHDDATA_H
+#ifndef AVCODEC_DNXHDDATA_H
+#define AVCODEC_DNXHDDATA_H

 #include <stdint.h>
 #include "avcodec.h"
@ -48,4 +48,4 @@ extern const CIDEntry ff_dnxhd_cid_table[];
 int ff_dnxhd_get_cid_table(int cid);
 int ff_dnxhd_find_cid(AVCodecContext *avctx);

-#endif /* FFMPEG_DNXHDDATA_H */
+#endif /* AVCODEC_DNXHDDATA_H */
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@ -27,8 +27,8 @@
 * absolutely necessary to call emms_c() between dsp & float/double code
 */

-#ifndef FFMPEG_DSPUTIL_H
-#define FFMPEG_DSPUTIL_H
+#ifndef AVCODEC_DSPUTIL_H
+#define AVCODEC_DSPUTIL_H

 #include "avcodec.h"

@ -824,4 +824,4 @@ static inline void copy_block17(uint8_t *dst, uint8_t *src, int dstStride, int s
    }
 }

-#endif /* FFMPEG_DSPUTIL_H */
+#endif /* AVCODEC_DSPUTIL_H */
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@ -24,8 +24,8 @@
 * Constants for DV codec.
 */

-#ifndef FFMPEG_DVDATA_H
-#define FFMPEG_DVDATA_H
+#ifndef AVCODEC_DVDATA_H
+#define AVCODEC_DVDATA_H

 #include "libavutil/rational.h"
 #include "avcodec.h"
@ -6443,4 +6443,4 @@ static inline int dv_write_ssyb_id(uint8_t syb_num, uint8_t fr, uint8_t* buf)
    return 3;
 }

-#endif /* FFMPEG_DVDATA_H */
+#endif /* AVCODEC_DVDATA_H */
--- a/libavcodec/elbg.h
+++ b/libavcodec/elbg.h
@ -18,8 +18,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#ifndef FFMPEG_ELBG_H
-#define FFMPEG_ELBG_H
+#ifndef AVCODEC_ELBG_H
+#define AVCODEC_ELBG_H

 #include "libavutil/random.h"

@ -52,4 +52,4 @@ void ff_init_elbg(int *points, int dim, int numpoints, int *codebook,
                  int numCB, int num_steps, int *closest_cb,
                  AVRandomState *rand_state);

-#endif /* FFMPEG_ELBG_H */
+#endif /* AVCODEC_ELBG_H */
--- a/libavcodec/eval.h
+++ b/libavcodec/eval.h
@ -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 @@ AVEvalExpr * ff_parse(const char *s, const char **const_name,
 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/libavcodec/faandct.h
+++ b/libavcodec/faandct.h
@ -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/libavcodec/faanidct.h
+++ b/libavcodec/faanidct.h
@ -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(DCTELEM block[64]);
 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/libavcodec/flac.h
+++ b/libavcodec/flac.h
@ -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 @@ typedef struct FLACStreaminfo {
 void ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s,
                              const uint8_t *buffer);

-#endif /* FFMPEG_FLAC_H */
+#endif /* AVCODEC_FLAC_H */
--- a/libavcodec/g729.h
+++ b/libavcodec/g729.h
@ -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/libavcodec/g729data.h
+++ b/libavcodec/g729data.h
@ -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 @@ static const int16_t cb_lsp_2nd[1<<VQ_2ND_BITS][10] =
  { -163,   674,   -11,  -886,   531, -1125,  -265,  -242,   724,   934}
 };

-#endif // FFMPEG_G729DATA_H
+#endif // AVCODEC_G729DATA_H
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@ -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 @@ static inline void set_sr_golomb_flac(PutBitContext *pb, int i, int k, int limit
    set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
 }

-#endif /* FFMPEG_GOLOMB_H */
+#endif /* AVCODEC_GOLOMB_H */
--- a/libavcodec/h261.h
+++ b/libavcodec/h261.h
@ -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 @@ typedef struct H261Context{

 #define MB_TYPE_H261_FIL 0x800000

-#endif /* FFMPEG_H261_H */
+#endif /* AVCODEC_H261_H */
--- a/libavcodec/h261data.h
+++ b/libavcodec/h261data.h
@ -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 @@ static RLTable h261_rl_tcoeff = {
    h261_tcoeff_level,
 };

-#endif /* FFMPEG_H261DATA_H */
+#endif /* AVCODEC_H261DATA_H */
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@ -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/libavcodec/h263_parser.h
+++ b/libavcodec/h263_parser.h
@ -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/libavcodec/h263data.h
+++ b/libavcodec/h263data.h
@ -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 @@ const uint8_t ff_h263_loop_filter_strength[32]={
    0, 1, 1, 2, 2, 3, 3, 4, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9,10,10,10,11,11,11,12,12,12
 };

-#endif /* FFMPEG_H263DATA_H */
+#endif /* AVCODEC_H263DATA_H */
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@ -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 @@ typedef struct H264Context{

 }H264Context;

-#endif /* FFMPEG_H264_H */
+#endif /* AVCODEC_H264_H */
--- a/libavcodec/h264_parser.h
+++ b/libavcodec/h264_parser.h
@ -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/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@ -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 @@ static const int8_t cabac_context_init_PB[3][460][2] =
    }
 };

-#endif /* FFMPEG_H264DATA_H */
+#endif /* AVCODEC_H264DATA_H */
--- a/libavcodec/h264pred.h
+++ b/libavcodec/h264pred.h
@ -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 @@ typedef struct H264PredContext{

 void ff_h264_pred_init(H264PredContext *h, int codec_id);

-#endif /* FFMPEG_H264PRED_H */
+#endif /* AVCODEC_H264PRED_H */
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@ -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 @@ typedef int (*huff_cmp_t)(const void *va, const void *vb);
 int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
                       Node *nodes, huff_cmp_t cmp, int flags);

-#endif /* FFMPEG_HUFFMAN_H */
+#endif /* AVCODEC_HUFFMAN_H */
--- a/libavcodec/i386/dsputil_mmx.h
+++ b/libavcodec/i386/dsputil_mmx.h
@ -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 @@ extern const double ff_pd_2[2];

 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);

-#endif /* FFMPEG_DSPUTIL_MMX_H */
+#endif /* AVCODEC_I386_DSPUTIL_MMX_H */
--- a/libavcodec/i386/h264_i386.h
+++ b/libavcodec/i386/h264_i386.h
@ -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 @@ static int decode_significance_8x8_x86(CABACContext *c,
 #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/libavcodec/i386/idct_xvid.h
+++ b/libavcodec/i386/idct_xvid.h
@ -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(short *block);
 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/libavcodec/i386/mathops.h
+++ b/libavcodec/i386/mathops.h
@ -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/libavcodec/i386/mmx.h
+++ b/libavcodec/i386/mmx.h
@ -18,8 +18,8 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#ifndef 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 @@ typedef        union {
 #define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)


-#endif /* FFMPEG_MMX_H */
+#endif /* AVCODEC_I386_MMX_H */
--- a/libavcodec/i386/vp3dsp_mmx.h
+++ b/libavcodec/i386/vp3dsp_mmx.h
@ -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_mmx(int16_t *data);
 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/libavcodec/i386/vp3dsp_sse2.h
+++ b/libavcodec/i386/vp3dsp_sse2.h
@ -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_sse2(int16_t *input_data);
 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/libavcodec/iirfilter.h
+++ b/libavcodec/iirfilter.h
@ -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_free_state(struct FFIIRFilterState *state);
 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/libavcodec/imcdata.h
+++ b/libavcodec/imcdata.h
@ -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 @@ static const uint16_t imc_huffman_bits[4][4][18] = {
    }
 };

-#endif /* FFMPEG_IMCDATA_H */
+#endif /* AVCODEC_IMCDATA_H */
--- a/libavcodec/imgconvert.h
+++ b/libavcodec/imgconvert.h
@ -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_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, int height);

 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane);

-#endif /* FFMPEG_IMGCONVERT_H */
+#endif /* AVCODEC_IMGCONVERT_H */
--- a/libavcodec/indeo2data.h
+++ b/libavcodec/indeo2data.h
@ -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 @@ static const uint8_t ir2_luma_table[256] = {
 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
 };

-#endif /* FFMPEG_INDEO2DATA_H */
+#endif /* AVCODEC_INDEO2DATA_H */
--- a/libavcodec/indeo3data.h
+++ b/libavcodec/indeo3data.h
@ -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 @@ static const uint32_t correctionhighorder[] = {
        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
 };

-#endif /* FFMPEG_INDEO3DATA_H */
+#endif /* AVCODEC_INDEO3DATA_H */
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@ -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_init(IntraX8Context * w, MpegEncContext * const s);
 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/libavcodec/intrax8huf.h
+++ b/libavcodec/intrax8huf.h
@ -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 @@ static const uint16_t x8_ac1_highquant_table[8][77][2]={
 };
 #define MAX_AC_VLC_BITS 16

-#endif /* FFMPEG_INTRAX8HUF_H */
+#endif /* AVCODEC_INTRAX8HUF_H */
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@ -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 @@ static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err
 #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/libavcodec/jpeglsdec.h
+++ b/libavcodec/jpeglsdec.h
@ -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_lse(MJpegDecodeContext *s);

 int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, int point_transform, int ilv);

-#endif /* FFMPEG_JPEGLSDEC_H */
+#endif /* AVCODEC_JPEGLSDEC_H */
--- a/libavcodec/lcl.h
+++ b/libavcodec/lcl.h
@ -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/libavcodec/libdirac.h
+++ b/libavcodec/libdirac.h
@ -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 @@ static const struct {
 };

 #endif /* CONFIG_LIBDIRAC */
-#endif /* FFMPEG_LIBDIRAC_H */
+#endif /* AVCODEC_LIBDIRAC_H */
--- a/libavcodec/libdirac_libschro.h
+++ b/libavcodec/libdirac_libschro.h
@ -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_pop (FfmpegDiracSchroQueue *queue);
 */
 void ff_dirac_schro_queue_free(FfmpegDiracSchroQueue *queue,
                               void (*free_func)(void *));
-#endif /* FFMPEG_LIBDIRAC_LIBSCHRO_H */
+#endif /* AVCODEC_LIBDIRAC_LIBSCHRO_H */
--- a/libavcodec/libschroedinger.h
+++ b/libavcodec/libschroedinger.h
@ -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 @@ int ff_get_schro_frame_format (SchroChromaFormat schro_chroma_fmt,
                               SchroFrameFormat  *schro_frame_fmt);

 #endif /* CONFIG_LIBSCHROEDINGER */
-#endif /* FFMPEG_LIBSCHROEDINGER_H */
+#endif /* AVCODEC_LIBSCHROEDINGER_H */
--- a/libavcodec/libxvid_internal.h
+++ b/libavcodec/libxvid_internal.h
@ -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/libavcodec/lpc.h
+++ b/libavcodec/lpc.h
@ -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 @@ int ff_lpc_calc_coefs(DSPContext *s,
                      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/libavcodec/lsp.h
+++ b/libavcodec/lsp.h
@ -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_lsp2lpc(int16_t* lp, const int16_t* lsp, int lp_half_order);
 */
 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/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@ -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 @@ void ff_lzw_encode_init(struct LZWEncodeState * s, uint8_t * outbuf, int outsize
 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/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@ -19,8 +19,8 @@
 * License along with FFmpeg; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
-#ifndef FFMPEG_MATHOPS_H
-#define FFMPEG_MATHOPS_H
+#ifndef AVCODEC_MATHOPS_H
+#define AVCODEC_MATHOPS_H

 #include "libavutil/common.h"

@ -83,5 +83,5 @@ static av_always_inline int MULH(int a, int b){
 #   define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb))
 #endif

-#endif /* FFMPEG_MATHOPS_H */
+#endif /* AVCODEC_MATHOPS_H */

--- a/libavcodec/mjpeg.h
+++ b/libavcodec/mjpeg.h
@ -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 @@ void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
                                  const uint8_t *bits_table,
                                  const uint8_t *val_table);

-#endif /* FFMPEG_MJPEG_H */
+#endif /* AVCODEC_MJPEG_H */
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@ -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_dht(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);

-#endif /* FFMPEG_MJPEGDEC_H */
+#endif /* AVCODEC_MJPEGDEC_H */
--- a/libavcodec/mjpegenc.h
+++ b/libavcodec/mjpegenc.h
@ -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 @@ void ff_mjpeg_encode_dc(MpegEncContext *s, int val,
                        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/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@ -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 @@ static inline uint8_t xor_32_to_8(uint32_t value)
    return value;
 }

-#endif /* FFMPEG_MLP_H */
+#endif /* AVCODEC_MLP_H */
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parser.h
@ -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 @@ typedef struct MLPHeaderInfo

 int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb);

-#endif /* FFMPEG_MLP_PARSER_H */
+#endif /* AVCODEC_MLP_PARSER_H */

--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@ -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 @@ typedef struct {
 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/libavcodec/mpc7data.h
+++ b/libavcodec/mpc7data.h
@ -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 @@ static const uint16_t mpc7_quant_vlc[MPC7_QUANT_VLC_TABLES][2][64 * 2] = {
 }
 };

-#endif /* FFMPEG_MPC7DATA_H */
+#endif /* AVCODEC_MPC7DATA_H */
--- a/libavcodec/mpc8data.h
+++ b/libavcodec/mpc8data.h
@ -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 @@ const static uint32_t mpc8_cnk_lost[16][33] =
    {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/libavcodec/mpc8huff.h
+++ b/libavcodec/mpc8huff.h
@ -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 @@ static const int8_t mpc8_q8_bits[2][MPC8_Q8_SIZE] = {
 }
 };

-#endif /* FFMPEG_MPC8HUFF_H */
+#endif /* AVCODEC_MPC8HUFF_H */
--- a/libavcodec/mpcdata.h
+++ b/libavcodec/mpcdata.h
@ -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 @@ static const float mpc_SCF[128] = {
    0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
 };

-#endif /* FFMPEG_MPCDATA_H */
+#endif /* AVCODEC_MPCDATA_H */
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@ -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 @@ static inline int decode_dc(GetBitContext *gb, int component)
    return diff;
 }

-#endif /* FFMPEG_MPEG12_H */
+#endif /* AVCODEC_MPEG12_H */
--- a/libavcodec/mpeg12data.h
+++ b/libavcodec/mpeg12data.h
@ -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 AVRational ff_frame_rate_tab[];
 extern const float ff_mpeg1_aspect[16];
 extern const AVRational ff_mpeg2_aspect[16];

-#endif /* FFMPEG_MPEG12DATA_H */
+#endif /* AVCODEC_MPEG12DATA_H */
--- a/libavcodec/mpeg12decdata.h
+++ b/libavcodec/mpeg12decdata.h
@ -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 @@ static const uint8_t * const mpeg2_dc_scale_table[4]={
    mpeg2_dc_scale_table3,
 };

-#endif /* FFMPEG_MPEG12DECDATA_H */
+#endif /* AVCODEC_MPEG12DECDATA_H */
--- a/libavcodec/mpeg4audio.h
+++ b/libavcodec/mpeg4audio.h
@ -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 @@ extern const uint8_t ff_mpeg4audio_channels[8];
 */
 int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_size);

-#endif /* FFMPEG_MPEGAUDIO_H */
+#endif /* AVCODEC_MPEG4AUDIO_H */
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@ -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 @@ static const uint8_t mpeg4_dc_threshold[8]={
    99, 13, 15, 17, 19, 21, 23, 0
 };

-#endif /* FFMPEG_MPEG4DATA_H */
+#endif /* AVCODEC_MPEG4DATA_H */
--- a/libavcodec/mpeg4video_parser.h
+++ b/libavcodec/mpeg4video_parser.h
@ -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/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@ -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 @@ static inline int ff_mpa_check_header(uint32_t header){
    return 0;
 }

-#endif /* FFMPEG_MPEGAUDIO_H */
+#endif /* AVCODEC_MPEGAUDIO_H */
--- a/libavcodec/mpegaudiodata.h
+++ b/libavcodec/mpegaudiodata.h
@ -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_steps[17];
 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/Show More
+++ b/Show More