Revision 5b21bdab

View differences:

cmdutils.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef CMDUTILS_H
23
#define CMDUTILS_H
22
#ifndef FFMPEG_CMDUTILS_H
23
#define FFMPEG_CMDUTILS_H
24 24

  
25 25
typedef struct {
26 26
    const char *name;
......
87 87
 */
88 88
void show_license(void);
89 89

  
90
#endif /* CMDUTILS_H */
90
#endif /* FFMPEG_CMDUTILS_H */
ffserver.h
18 18
 * License along with FFmpeg; if not, write to the Free Software
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21
#ifndef FFSERVER_H
22
#define FFSERVER_H
21
#ifndef FFMPEG_FFSERVER_H
22
#define FFMPEG_FFSERVER_H
23 23

  
24 24
/* interface between ffserver and modules */
25 25

  
26 26
void ffserver_module_init(void);
27 27

  
28
#endif
28
#endif /* FFMPEG_FFSERVER_H */
libavcodec/aac_ac3_parser.h
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#ifndef AAC_AC3_PARSER_H
24
#define AAC_AC3_PARSER_H
23
#ifndef FFMPEG_AAC_AC3_PARSER_H
24
#define FFMPEG_AAC_AC3_PARSER_H
25 25

  
26 26
#include <stdint.h>
27 27
#include "avcodec.h"
......
40 40
                     const uint8_t **poutbuf, int *poutbuf_size,
41 41
                     const uint8_t *buf, int buf_size);
42 42

  
43
#endif /* AAC_AC3_PARSER_H */
43
#endif /* FFMPEG_AAC_AC3_PARSER_H */
libavcodec/ac3.h
24 24
 * Common code between AC3 encoder and decoder.
25 25
 */
26 26

  
27
#ifndef AC3_H
28
#define AC3_H
27
#ifndef FFMPEG_AC3_H
28
#define FFMPEG_AC3_H
29 29

  
30 30
#include "ac3tab.h"
31 31

  
......
172 172
                                   int deltbae,int deltnseg,
173 173
                                   uint8_t *deltoffst, uint8_t *deltlen, uint8_t *deltba);
174 174

  
175
#endif /* AC3_H */
175
#endif /* FFMPEG_AC3_H */
libavcodec/ac3_parser.h
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#ifndef AC3_PARSER_H
24
#define AC3_PARSER_H
23
#ifndef FFMPEG_AC3_PARSER_H
24
#define FFMPEG_AC3_PARSER_H
25 25

  
26 26
#include "ac3.h"
27 27

  
......
44 44
 */
45 45
int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr);
46 46

  
47
#endif /* AC3_PARSER_H */
47
#endif /* FFMPEG_AC3_PARSER_H */
libavcodec/ac3tab.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AC3TAB_H
23
#define AC3TAB_H
22
#ifndef FFMPEG_AC3TAB_H
23
#define FFMPEG_AC3TAB_H
24 24

  
25 25
#include "common.h"
26 26

  
......
40 40
extern const uint16_t ff_fgaintab[8];
41 41
extern const uint8_t  ff_ac3_bndsz[50];
42 42

  
43
#endif /* AC3TAB_H */
43
#endif /* FFMPEG_AC3TAB_H */
libavcodec/alpha/asm.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef LIBAVCODEC_ALPHA_ASM_H
23
#define LIBAVCODEC_ALPHA_ASM_H
22
#ifndef FFMPEG_ASM_H
23
#define FFMPEG_ASM_H
24 24

  
25 25
#include <inttypes.h>
26 26

  
......
188 188
#error "Unknown compiler!"
189 189
#endif
190 190

  
191
#endif /* LIBAVCODEC_ALPHA_ASM_H */
191
#endif /* FFMPEG_ASM_H */
libavcodec/alpha/regdef.h
20 20
 */
21 21

  
22 22
/* Some BSDs don't seem to have regdef.h... sigh  */
23
#ifndef alpha_regdef_h
24
#define alpha_regdef_h
23
#ifndef FFMPEG_REGDEF_H
24
#define FFMPEG_REGDEF_H
25 25

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

  
......
63 63
#define sp      $30     /* stack pointer */
64 64
#define zero    $31     /* reads as zero, writes are noops */
65 65

  
66
#endif /* alpha_regdef_h */
66
#endif /* FFMPEG_REGDEF_H */
libavcodec/armv4l/mathops.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_ARM_MATHOPS_H
23
#define AVCODEC_ARM_MATHOPS_H
22
#ifndef FFMPEG_ARMV4L_MATHOPS_H
23
#define FFMPEG_ARMV4L_MATHOPS_H
24 24

  
25 25
#ifdef FRAC_BITS
26 26
#   define MULL(a, b) \
......
51 51

  
52 52
#endif
53 53

  
54
#endif // AVCODEC_ARM_MATHOPS_H
54
#endif /* FFMPEG_ARMV4L_MATHOPS_H */
libavcodec/atrac3data.h
25 25
 * Atrac 3 AKA RealAudio 8 compatible decoder data
26 26
 */
27 27

  
28
#ifndef AVCODEC_ATRAC3DATA_H
29
#define AVCODEC_ATRAC3DATA_H
28
#ifndef FFMPEG_ATRAC3DATA_H
29
#define FFMPEG_ATRAC3DATA_H
30 30

  
31 31
#include <stdint.h>
32 32

  
......
137 137
/* joint stereo related tables */
138 138
static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0};
139 139

  
140
#endif // AVCODEC_ATRAC3DATA_H
140
#endif /* FFMPEG_ATRAC3DATA_H */
libavcodec/avcodec.h
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#ifndef AVCODEC_H
22
#define AVCODEC_H
21
#ifndef FFMPEG_AVCODEC_H
22
#define FFMPEG_AVCODEC_H
23 23

  
24 24
/**
25 25
 * @file avcodec.h
......
2933 2933
#define AVERROR_NOENT       AVERROR(ENOENT)  /**< No such file or directory. */
2934 2934
#define AVERROR_PATCHWELCOME    -MKTAG('P','A','W','E') /**< Not yet implemented in FFmpeg. Patches welcome. */
2935 2935

  
2936
#endif /* AVCODEC_H */
2936
#endif /* FFMPEG_AVCODEC_H */
libavcodec/bethsoftvideo.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_BETHSOFTVIDEO_H
23
#define AVCODEC_BETHSOFTVIDEO_H
22
#ifndef FFMPEG_BETHSOFTVIDEO_H
23
#define FFMPEG_BETHSOFTVIDEO_H
24 24

  
25 25
enum BethsoftVidBlockType
26 26
{
......
33 33
    EOF_BLOCK           = 0x14,
34 34
};
35 35

  
36
#endif // AVCODEC_BETHSOFTVIDEO_H
36
#endif /* FFMPEG_BETHSOFTVIDEO_H */
libavcodec/bfin/dsputil_bfin.h
21 21
 */
22 22

  
23 23

  
24
#ifndef DSPUTIL_BFIN_H
25
#define DSPUTIL_BFIN_H
24
#ifndef FFMPEG_DSPUTIL_BFIN_H
25
#define FFMPEG_DSPUTIL_BFIN_H
26 26

  
27 27
#define attribute_l1_text  __attribute__ ((l1_text))
28 28

  
......
65 65
#define bfprof()
66 66
#endif
67 67

  
68
#endif
68
#endif /* FFMPEG_DSPUTIL_BFIN_H */
libavcodec/bfin/mathops.h
19 19
 * License along with FFmpeg; if not, write to the Free Software
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22
#ifndef AVCODEC_BFIN_MATHOPS_H
23
#define AVCODEC_BFIN_MATHOPS_H
22
#ifndef FFMPEG_BFIN_MATHOPS_H
23
#define FFMPEG_BFIN_MATHOPS_H
24 24

  
25 25
#ifdef CONFIG_MPEGAUDIO_HP
26 26
#define MULH(X,Y) ({ int xxo;                           \
......
49 49
       : "=W" (xxo) : "d" (a), "d" (b) : "A1");         \
50 50
    xxo; })
51 51

  
52
#endif /* AVCODEC_BFIN_MATHOPS_H */
52
#endif /* FFMPEG_BFIN_MATHOPS_H */
libavcodec/bitstream.h
23 23
 * bitstream api header.
24 24
 */
25 25

  
26
#ifndef BITSTREAM_H
27
#define BITSTREAM_H
26
#ifndef FFMPEG_BITSTREAM_H
27
#define FFMPEG_BITSTREAM_H
28 28

  
29 29
#include <stdint.h>
30 30
#include <stdlib.h>
......
950 950
        return get_bits1(gb) + 1;
951 951
}
952 952

  
953
#endif /* BITSTREAM_H */
953
#endif /* FFMPEG_BITSTREAM_H */
libavcodec/bmp.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_BMP_H
23
#define AVCODEC_BMP_H
22
#ifndef FFMPEG_BMP_H
23
#define FFMPEG_BMP_H
24 24

  
25 25
#include "avcodec.h"
26 26

  
......
35 35
    BMP_BITFIELDS   =3,
36 36
} BiCompression;
37 37

  
38
#endif // AVCODEC_BMP_H
38
#endif /* FFMPEG_BMP_H */
libavcodec/cabac.h
24 24
 * Context Adaptive Binary Arithmetic Coder.
25 25
 */
26 26

  
27
#ifndef CABAC_H
28
#define CABAC_H
27
#ifndef FFMPEG_CABAC_H
28
#define FFMPEG_CABAC_H
29 29

  
30 30
#include "bitstream.h"
31 31

  
......
867 867
}
868 868
#endif /* 0 */
869 869

  
870
#endif /* CABAC_H */
870
#endif /* FFMPEG_CABAC_H */
libavcodec/cavs.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef CAVS_H
23
#define CAVS_H
22
#ifndef FFMPEG_CAVS_H
23
#define FFMPEG_CAVS_H
24 24

  
25 25
#include "dsputil.h"
26 26
#include "mpegvideo.h"
......
311 311
int ff_cavs_init(AVCodecContext *avctx);
312 312
int ff_cavs_end (AVCodecContext *avctx);
313 313

  
314
#endif /* CAVS_H */
314
#endif /* FFMPEG_CAVS_H */
libavcodec/cavsdata.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_CAVSDATA_H
23
#define AVCODEC_CAVSDATA_H
22
#ifndef FFMPEG_CAVSDATA_H
23
#define FFMPEG_CAVSDATA_H
24 24

  
25 25
#include "cavs.h"
26 26

  
......
502 502
const int_fast8_t ff_left_modifier_c[7] = { 5,-1, 2,-1, 6, 5, 6};
503 503
const int_fast8_t ff_top_modifier_c[7]  = { 4, 1,-1,-1, 4, 6, 6};
504 504

  
505
#endif // AVCODEC_CAVSDATA_H
505
#endif /* FFMPEG_CAVSDATA_H */
libavcodec/cookdata.h
25 25
 * Cook AKA RealAudio G2 compatible decoderdata
26 26
 */
27 27

  
28
#ifndef AVCODEC_COOKDATA_H
29
#define AVCODEC_COOKDATA_H
28
#ifndef FFMPEG_COOKDATA_H
29
#define FFMPEG_COOKDATA_H
30 30

  
31 31
#include <stdint.h>
32 32

  
......
562 562
    cplscale2, cplscale3, cplscale4, cplscale5, cplscale6,
563 563
};
564 564

  
565
#endif // AVCODEC_COOKDATA_H
565
#endif /* FFMPEG_COOKDATA_H */
libavcodec/dca.h
22 22
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
23 23
 */
24 24

  
25
#ifndef AVCODEC_DCA_H
26
#define AVCODEC_DCA_H
25
#ifndef FFMPEG_DCA_H
26
#define FFMPEG_DCA_H
27 27

  
28 28
/** DCA syncwords, also used for bitstream type detection */
29 29
#define DCA_MARKER_RAW_BE 0x7FFE8001
......
31 31
#define DCA_MARKER_14B_BE 0x1FFFE800
32 32
#define DCA_MARKER_14B_LE 0xFF1F00E8
33 33

  
34
#endif // AVCODEC_DCA_H
34
#endif /* FFMPEG_DCA_H */
libavcodec/dcadata.h
24 24
 * @file dcadata.c
25 25
 */
26 26

  
27
#ifndef AVCODEC_DCADATA_H
28
#define AVCODEC_DCADATA_H
27
#ifndef FFMPEG_DCADATA_H
28
#define FFMPEG_DCADATA_H
29 29

  
30 30
#include <stdint.h>
31 31

  
......
8471 8471

  
8472 8472
*/
8473 8473

  
8474
#endif // AVCODEC_DCADATA_H
8474
#endif /* FFMPEG_DCADATA_H */
libavcodec/dcahuff.h
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#ifndef AVCODEC_DCAHUFF_H
24
#define AVCODEC_DCAHUFF_H
23
#ifndef FFMPEG_DCAHUFF_H
24
#define FFMPEG_DCAHUFF_H
25 25

  
26 26
#include <stdint.h>
27 27
#include <stdlib.h>
......
1073 1073
    bitalloc_129_bits_e, bitalloc_129_bits_f, bitalloc_129_bits_g, NULL }
1074 1074
};
1075 1075

  
1076
#endif // AVCODEC_DCAHUFF_H
1076
#endif /* FFMPEG_DCAHUFF_H */
libavcodec/dnxhddata.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_DNXHDDATA_H
23
#define AVCODEC_DNXHDDATA_H
22
#ifndef FFMPEG_DNXHDDATA_H
23
#define FFMPEG_DNXHDDATA_H
24 24

  
25 25
#include <stdint.h>
26 26

  
......
45 45

  
46 46
int ff_dnxhd_get_cid_table(int cid);
47 47

  
48
#endif  // AVCODEC_DNXHDDATA_H
48
#endif /* FFMPEG_DNXHDDATA_H */
libavcodec/dsputil.h
27 27
 * absolutely necessary to call emms_c() between dsp & float/double code
28 28
 */
29 29

  
30
#ifndef DSPUTIL_H
31
#define DSPUTIL_H
30
#ifndef FFMPEG_DSPUTIL_H
31
#define FFMPEG_DSPUTIL_H
32 32

  
33 33
#include "avcodec.h"
34 34

  
......
743 743
    }
744 744
}
745 745

  
746
#endif
746
#endif /* FFMPEG_DSPUTIL_H */
libavcodec/dvdata.h
24 24
 * Constants for DV codec.
25 25
 */
26 26

  
27
#ifndef AVCODEC_DVDATA_H
28
#define AVCODEC_DVDATA_H
27
#ifndef FFMPEG_DVDATA_H
28
#define FFMPEG_DVDATA_H
29 29

  
30 30
#include "avcodec.h"
31 31
#include "rational.h"
......
2729 2729
    return 3;
2730 2730
}
2731 2731

  
2732
#endif // AVCODEC_DVDATA_H
2732
#endif /* FFMPEG_DVDATA_H */
libavcodec/elbg.h
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#ifndef AVCODEC_ELBG_H
22
#define AVCODEC_ELBG_H
21
#ifndef FFMPEG_ELBG_H
22
#define FFMPEG_ELBG_H
23 23

  
24 24
#include "random.h"
25 25

  
......
52 52
                  int numCB, int num_steps, int *closest_cb,
53 53
                  AVRandomState *rand_state);
54 54

  
55
#endif // AVCODEC_ELBG_H
55
#endif /* FFMPEG_ELBG_H */
libavcodec/eval.h
25 25
 * eval header.
26 26
 */
27 27

  
28
#ifndef AVCODEC_EVAL_H
29
#define AVCODEC_EVAL_H
28
#ifndef FFMPEG_EVAL_H
29
#define FFMPEG_EVAL_H
30 30

  
31 31
#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
32 32
/**
......
84 84
double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque);
85 85
void ff_eval_free(AVEvalExpr * e);
86 86

  
87
#endif /* AVCODEC_EVAL_H */
87
#endif /* FFMPEG_EVAL_H */
libavcodec/faandct.h
26 26
 * @author Michael Niedermayer <michaelni@gmx.at>
27 27
 */
28 28

  
29
#ifndef AVCODEC_FAANDCT_H
30
#define AVCODEC_FAANDCT_H
29
#ifndef FFMPEG_FAANDCT_H
30
#define FFMPEG_FAANDCT_H
31 31

  
32 32
#include "dsputil.h"
33 33

  
......
36 36
void ff_faandct(DCTELEM * data);
37 37
void ff_faandct248(DCTELEM * data);
38 38

  
39
#endif // AVCODEC_FAANDCT_H
39
#endif /* FFMPEG_FAANDCT_H */
libavcodec/golomb.h
27 27
 * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
28 28
 */
29 29

  
30
#ifndef AVCODEC_GOLOMB_H
31
#define AVCODEC_GOLOMB_H
30
#ifndef FFMPEG_GOLOMB_H
31
#define FFMPEG_GOLOMB_H
32 32

  
33 33
#include <stdint.h>
34 34
#include "bitstream.h"
......
504 504
    set_ur_golomb_jpegls(pb, v, k, limit, esc_len);
505 505
}
506 506

  
507
#endif // AVCODEC_GOLOMB_H
507
#endif /* FFMPEG_GOLOMB_H */
libavcodec/h261.h
25 25
 * h261codec.
26 26
 */
27 27

  
28
#ifndef AVCODEC_H261_H
29
#define AVCODEC_H261_H
28
#ifndef FFMPEG_H261_H
29
#define FFMPEG_H261_H
30 30

  
31 31
#include "mpegvideo.h"
32 32

  
......
48 48

  
49 49
#define MB_TYPE_H261_FIL 0x800000
50 50

  
51
#endif /* AVCODEC_H261_H */
51
#endif /* FFMPEG_H261_H */
libavcodec/h261data.h
24 24
 * H.261 tables.
25 25
 */
26 26

  
27
#ifndef AVCODEC_H261DATA_H
28
#define AVCODEC_H261DATA_H
27
#ifndef FFMPEG_H261DATA_H
28
#define FFMPEG_H261DATA_H
29 29

  
30 30
#include <stdint.h>
31 31
#include "h261.h"
......
161 161
    h261_tcoeff_level,
162 162
};
163 163

  
164
#endif // AVCODEC_H261DATA_H
164
#endif /* FFMPEG_H261DATA_H */
libavcodec/h263.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_H263_H
23
#define AVCODEC_H263_H
22
#ifndef FFMPEG_H263_H
23
#define FFMPEG_H263_H
24 24

  
25 25
#include "config.h"
26 26
#include "msmpeg4.h"
......
43 43
                                 ENABLE_WMV_ENCODER)
44 44
#define ENABLE_ANY_H263 (ENABLE_ANY_H263_DECODER || ENABLE_ANY_H263_ENCODER)
45 45

  
46
#endif /* AVCODEC_H263_H */
46
#endif /* FFMPEG_H263_H */
libavcodec/h263_parser.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_H263_PARSER_H
23
#define AVCODEC_H263_PARSER_H
22
#ifndef FFMPEG_H263_PARSER_H
23
#define FFMPEG_H263_PARSER_H
24 24

  
25 25
#include "parser.h"
26 26

  
27 27
int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
28 28

  
29
#endif // AVCODEC_H263_PARSER_H
29
#endif /* FFMPEG_H263_PARSER_H */
libavcodec/h263data.h
26 26
 * H.263 tables.
27 27
 */
28 28

  
29
#ifndef AVCODEC_H263DATA_H
30
#define AVCODEC_H263DATA_H
29
#ifndef FFMPEG_H263DATA_H
30
#define FFMPEG_H263DATA_H
31 31

  
32 32
#include <stdint.h>
33 33
#include "mpegvideo.h"
......
311 311
    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
312 312
};
313 313

  
314
#endif // AVCODEC_H263DATA_H
314
#endif /* FFMPEG_H263DATA_H */
libavcodec/h264.h
25 25
 * @author Michael Niedermayer <michaelni@gmx.at>
26 26
 */
27 27

  
28
#ifndef H264_H
29
#define H264_H
28
#ifndef FFMPEG_H264_H
29
#define FFMPEG_H264_H
30 30

  
31 31
#include "dsputil.h"
32 32
#include "cabac.h"
......
416 416

  
417 417
}H264Context;
418 418

  
419
#endif /* H264_H */
419
#endif /* FFMPEG_H264_H */
libavcodec/h264_parser.h
25 25
 * @author Michael Niedermayer <michaelni@gmx.at>
26 26
 */
27 27

  
28
#ifndef H264_PARSER_H
29
#define H264_PARSER_H
28
#ifndef FFMPEG_H264_PARSER_H
29
#define FFMPEG_H264_PARSER_H
30 30

  
31 31
#include "h264.h"
32 32

  
......
36 36
 */
37 37
int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size);
38 38

  
39
#endif /* H264_PARSER_H */
39
#endif /* FFMPEG_H264_PARSER_H */
libavcodec/h264data.h
26 26
 * @author Michael Niedermayer <michaelni@gmx.at>
27 27
 */
28 28

  
29
#ifndef AVCODEC_H264DATA_H
30
#define AVCODEC_H264DATA_H
29
#ifndef FFMPEG_H264DATA_H
30
#define FFMPEG_H264DATA_H
31 31

  
32 32
#include <stdint.h>
33 33
#include "mpegvideo.h"
......
1305 1305
    }
1306 1306
};
1307 1307

  
1308
#endif // AVCODEC_H264DATA_H
1308
#endif /* FFMPEG_H264DATA_H */
libavcodec/h264pred.h
25 25
 * @author Michael Niedermayer <michaelni@gmx.at>
26 26
 */
27 27

  
28
#ifndef H264PRED_H
29
#define H264PRED_H
28
#ifndef FFMPEG_H264PRED_H
29
#define FFMPEG_H264PRED_H
30 30

  
31 31
#include "common.h"
32 32

  
......
73 73

  
74 74
void ff_h264_pred_init(H264PredContext *h, int codec_id);
75 75

  
76
#endif /* H264PRED_H */
76
#endif /* FFMPEG_H264PRED_H */
libavcodec/huffman.h
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#ifndef AVCODEC_HUFFMAN_H
24
#define AVCODEC_HUFFMAN_H
23
#ifndef FFMPEG_HUFFMAN_H
24
#define FFMPEG_HUFFMAN_H
25 25

  
26 26
#include "avcodec.h"
27 27

  
......
35 35
int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
36 36
                       Node *nodes, huff_cmp_t cmp, int hnode_first);
37 37

  
38
#endif /* AVCODEC_HUFFMAN_H */
38
#endif /* FFMPEG_HUFFMAN_H */
libavcodec/i386/mathops.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_X86_MATHOPS_H
23
#define AVCODEC_X86_MATHOPS_H
22
#ifndef FFMPEG_I386_MATHOPS_H
23
#define FFMPEG_I386_MATHOPS_H
24 24

  
25 25
#ifdef FRAC_BITS
26 26
#   define MULL(ra, rb) \
......
42 42
     asm ("imull %2\n\t" : "=A"(rt) : "a" (ra), "g" (rb));\
43 43
     rt; })
44 44

  
45
#endif // AVCODEC_X86_MATHOPS_H
45
#endif /* FFMPEG_I386_MATHOPS_H */
libavcodec/i386/mmx.h
18 18
 * License along with FFmpeg; if not, write to the Free Software
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21
#ifndef AVCODEC_I386MMX_H
22
#define AVCODEC_I386MMX_H
21
#ifndef FFMPEG_MMX_H
22
#define FFMPEG_MMX_H
23 23

  
24 24
/*
25 25
 * The type of an value that fits in an MMX register (note that long
......
280 280
#define         punpckhqdq_r2r(regs,regd)   mmx_r2r (punpckhqdq, regs, regd)
281 281

  
282 282

  
283
#endif /* AVCODEC_I386MMX_H */
283
#endif /* FFMPEG_MMX_H */
libavcodec/i386/vp3dsp_mmx.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef VP3DSP_MMX_H
23
#define VP3DSP_MMX_H
22
#ifndef FFMPEG_VP3DSP_MMX_H
23
#define FFMPEG_VP3DSP_MMX_H
24 24

  
25 25
#include "dsputil.h"
26 26

  
......
29 29
void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block);
30 30
void ff_vp3_dsp_init_mmx(void);
31 31

  
32
#endif /* VP3DSP_MMX_H */
32
#endif /* FFMPEG_VP3DSP_MMX_H */
libavcodec/i386/vp3dsp_sse2.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef VP3DSP_SSE2_H
23
#define VP3DSP_SSE2_H
22
#ifndef FFMPEG_VP3DSP_SSE2_H
23
#define FFMPEG_VP3DSP_SSE2_H
24 24

  
25 25
#include "dsputil.h"
26 26

  
......
28 28
void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block);
29 29
void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block);
30 30

  
31
#endif /* VP3DSP_SSE2_H */
31
#endif /* FFMPEG_VP3DSP_SSE2_H */
libavcodec/imcdata.h
21 21
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
22 22
 */
23 23

  
24
#ifndef AVCODEC_IMCDATA_H
25
#define AVCODEC_IMCDATA_H
24
#ifndef FFMPEG_IMCDATA_H
25
#define FFMPEG_IMCDATA_H
26 26

  
27 27
#include <stdint.h>
28 28

  
......
166 166
    }
167 167
};
168 168

  
169
#endif // AVCODEC_IMCDATA_H
169
#endif /* FFMPEG_IMCDATA_H */
libavcodec/indeo2data.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_INDEO2DATA_H
23
#define AVCODEC_INDEO2DATA_H
22
#ifndef FFMPEG_INDEO2DATA_H
23
#define FFMPEG_INDEO2DATA_H
24 24

  
25 25
#include <stdint.h>
26 26

  
......
138 138
 0x3F, 0x94, 0xD9, 0xD9, 0x27, 0x27, 0x80, 0x80
139 139
};
140 140

  
141
#endif // AVCODEC_INDEO2DATA_H
141
#endif /* FFMPEG_INDEO2DATA_H */
libavcodec/indeo3data.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_INDEO3DATA_H
23
#define AVCODEC_INDEO3DATA_H
22
#ifndef FFMPEG_INDEO3DATA_H
23
#define FFMPEG_INDEO3DATA_H
24 24

  
25 25
#include <stdint.h>
26 26

  
......
2339 2339
        0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000
2340 2340
};
2341 2341

  
2342
#endif // AVCODEC_INDEO3DATA_H
2342
#endif /* FFMPEG_INDEO3DATA_H */
libavcodec/jpegls.h
25 25
 * JPEG-LS common code.
26 26
 */
27 27

  
28
#ifndef JPEGLS_H
29
#define JPEGLS_H
28
#ifndef FFMPEG_JPEGLS_H
29
#define FFMPEG_JPEGLS_H
30 30

  
31 31
#include "avcodec.h"
32 32

  
......
108 108
#define R(a, i   ) (bits == 8 ?  ((uint8_t*)(a))[i]    :  ((uint16_t*)(a))[i]  )
109 109
#define W(a, i, v) (bits == 8 ? (((uint8_t*)(a))[i]=v) : (((uint16_t*)(a))[i]=v))
110 110

  
111
#endif /* JPEGLS_H */
111
#endif /* FFMPEG_JPEGLS_H */
libavcodec/jpeglsdec.h
25 25
 * JPEG-LS decoder.
26 26
 */
27 27

  
28
#ifndef JPEGLSDEC_H
29
#define JPEGLSDEC_H
28
#ifndef FFMPEG_JPEGLSDEC_H
29
#define FFMPEG_JPEGLSDEC_H
30 30

  
31 31
#include "mjpeg.h"
32 32
#include "mjpegdec.h"
......
38 38

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

  
41
#endif /* JPEGLSDEC_H */
41
#endif /* FFMPEG_JPEGLSDEC_H */
libavcodec/lcl.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_LCL_H
23
#define AVCODEC_LCL_H
22
#ifndef FFMPEG_LCL_H
23
#define FFMPEG_LCL_H
24 24

  
25 25
#define BMPTYPE_YUV 1
26 26
#define BMPTYPE_RGB 2
......
46 46
#define CODEC_MSZH 1
47 47
#define CODEC_ZLIB 3
48 48

  
49
#endif /* AVCODEC_LCL_H */
49
#endif /* FFMPEG_LCL_H */
libavcodec/libxvid_internal.h
18 18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
 */
20 20

  
21
#ifndef LIBXVID_INTERNAL_H
22
#define LIBXVID_INTERNAL_H
21
#ifndef FFMPEG_LIBXVID_INTERNAL_H
22
#define FFMPEG_LIBXVID_INTERNAL_H
23 23

  
24 24
/**
25 25
 * @file libxvid_internal.h
......
29 29

  
30 30
int av_tempfile(char *prefix, char **filename);
31 31

  
32
#endif /* LIBXVID_INTERNAL_H */
32
#endif /* FFMPEG_LIBXVID_INTERNAL_H */
libavcodec/lzw.h
27 27
 * Modified for use in TIFF by Konstantin Shishkov
28 28
 */
29 29

  
30
#ifndef LZW_H
31
#define LZW_H
30
#ifndef FFMPEG_LZW_H
31
#define FFMPEG_LZW_H
32 32

  
33 33
#include "bitstream.h"
34 34

  
......
56 56
int ff_lzw_encode(struct LZWEncodeState * s, const uint8_t * inbuf, int insize);
57 57
int ff_lzw_encode_flush(struct LZWEncodeState * s);
58 58

  
59
#endif
59
#endif /* FFMPEG_LZW_H */
libavcodec/mathops.h
19 19
 * License along with FFmpeg; if not, write to the Free Software
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22
#ifndef MATHOPS_H
23
#define MATHOPS_H
22
#ifndef FFMPEG_MATHOPS_H
23
#define FFMPEG_MATHOPS_H
24 24

  
25 25
#include "common.h"
26 26

  
......
71 71
#   define MUL16(ra, rb) ((ra) * (rb))
72 72
#endif
73 73

  
74
#endif //MATHOPS_H
74
#endif /* FFMPEG_MATHOPS_H */
75 75

  
libavcodec/mjpeg.h
30 30
 * MJPEG encoder and decoder.
31 31
 */
32 32

  
33
#ifndef MJPEG_H
34
#define MJPEG_H
33
#ifndef FFMPEG_MJPEG_H
34
#define FFMPEG_MJPEG_H
35 35

  
36 36
#include "avcodec.h"
37 37
#include "bitstream.h"
......
153 153
                                  const uint8_t *bits_table,
154 154
                                  const uint8_t *val_table);
155 155

  
156
#endif /* MJPEG_H */
156
#endif /* FFMPEG_MJPEG_H */
libavcodec/mjpegdec.h
26 26
 * MJPEG decoder.
27 27
 */
28 28

  
29
#ifndef MJPEGDEC_H
30
#define MJPEGDEC_H
29
#ifndef FFMPEG_MJPEGDEC_H
30
#define FFMPEG_MJPEGDEC_H
31 31

  
32 32
#include "avcodec.h"
33 33
#include "bitstream.h"
......
109 109
int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
110 110
int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
111 111

  
112
#endif /* MJPEGDEC_H */
112
#endif /* FFMPEG_MJPEGDEC_H */
libavcodec/mjpegenc.h
30 30
 * MJPEG encoder.
31 31
 */
32 32

  
33
#ifndef MJPEGENC_H
34
#define MJPEGENC_H
33
#ifndef FFMPEG_MJPEGENC_H
34
#define FFMPEG_MJPEGENC_H
35 35

  
36 36
#include "dsputil.h"
37 37
#include "mpegvideo.h"
......
57 57
                        uint8_t *huff_size, uint16_t *huff_code);
58 58
void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64]);
59 59

  
60
#endif /* MJPEGENC_H */
60
#endif /* FFMPEG_MJPEGENC_H */
libavcodec/mpcdata.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_MPCDATA_H
23
#define AVCODEC_MPCDATA_H
22
#ifndef FFMPEG_MPCDATA_H
23
#define FFMPEG_MPCDATA_H
24 24

  
25 25
#include <stdint.h>
26 26

  
......
209 209
    0.000000044293003043, 0.000000036895215771, 0.000000030733001921, 0.000000025599996789
210 210
};
211 211

  
212
#endif // AVCODEC_MPCDATA_H
212
#endif /* FFMPEG_MPCDATA_H */
libavcodec/mpeg12.h
19 19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 20
 */
21 21

  
22
#ifndef AVCODEC_MPEG12_H
23
#define AVCODEC_MPEG12_H
22
#ifndef FFMPEG_MPEG12_H
23
#define FFMPEG_MPEG12_H
24 24

  
25 25
#include "mpegvideo.h"
26 26

  
......
28 28

  
29 29
void ff_mpeg12_common_init(MpegEncContext *s);
30 30

  
31
#endif /* AVCODEC_MPEG12_H */
31
#endif /* FFMPEG_MPEG12_H */
libavcodec/mpeg12data.h
25 25
 * MPEG1/2 tables.
26 26
 */
27 27

  
28
#ifndef AVCODEC_MPEG12DATA_H
29
#define AVCODEC_MPEG12DATA_H
28
#ifndef FFMPEG_MPEG12DATA_H
29
#define FFMPEG_MPEG12DATA_H
30 30

  
31 31
#include <stdint.h>
32 32
#include "mpegvideo.h"
......
47 47
extern const float ff_mpeg1_aspect[16];
48 48
extern const AVRational ff_mpeg2_aspect[16];
49 49

  
50
#endif // AVCODEC_MPEG12DATA_H
50
#endif /* FFMPEG_MPEG12DATA_H */
libavcodec/mpeg12decdata.h
25 25
 * MPEG1/2 decoder tables.
26 26
 */
27 27

  
28
#ifndef AVCODEC_MPEG12DECDATA_H
29
#define AVCODEC_MPEG12DECDATA_H
28
#ifndef FFMPEG_MPEG12DECDATA_H
29
#define FFMPEG_MPEG12DECDATA_H
30 30

  
31 31
#include <stdint.h>
32 32
#include "mpegvideo.h"
......
121 121
    mpeg2_dc_scale_table3,
122 122
};
123 123

  
124
#endif // AVCODEC_MPEG12DECDATA_H
124
#endif /* FFMPEG_MPEG12DECDATA_H */
libavcodec/mpeg4data.h
25 25
 * mpeg4 tables.
26 26
 */
27 27

  
28
#ifndef AVCODEC_MPEG4DATA_H
29
#define AVCODEC_MPEG4DATA_H
28
#ifndef FFMPEG_MPEG4DATA_H
29
#define FFMPEG_MPEG4DATA_H
30 30

  
31 31
#include <stdint.h>
32 32
#include "mpegvideo.h"
......
429 429
    99, 13, 15, 17, 19, 21, 23, 0
430 430
};
431 431

  
432
#endif // AVCODEC_MPEG4DATA_H
432
#endif /* FFMPEG_MPEG4DATA_H */
libavcodec/mpeg4video_parser.h
20 20
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 21
 */
22 22

  
23
#ifndef MPEG4VIDEO_PARSER_H
24
#define MPEG4VIDEO_PARSER_H
23
#ifndef FFMPEG_MPEG4VIDEO_PARSER_H
24
#define FFMPEG_MPEG4VIDEO_PARSER_H
25 25

  
26 26
#include "parser.h"
27 27

  
......
31 31
 */
32 32
int ff_mpeg4_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size);
33 33

  
34
#endif /* MPEG4VIDEO_PARSER_H */
34
#endif /* FFMPEG_MPEG4VIDEO_PARSER_H */
libavcodec/mpegaudio.h
23 23
 * mpeg audio declarations for both encoder and decoder.
24 24
 */
25 25

  
26
#ifndef MPEGAUDIO_H
27
#define MPEGAUDIO_H
26
#ifndef FFMPEG_MPEGAUDIO_H
27
#define FFMPEG_MPEGAUDIO_H
28 28

  
29 29
#include "avcodec.h"
30 30
#include "bitstream.h"
......
152 152
    return 0;
153 153
}
154 154

  
155
#endif /* MPEGAUDIO_H */
155
#endif /* FFMPEG_MPEGAUDIO_H */
libavcodec/mpegaudiodata.h
24 24
 * mpeg audio layer common tables.
25 25
 */
26 26

  
27
#ifndef MPEGAUDIODATA_H
28
#define MPEGAUDIODATA_H
27
#ifndef FFMPEG_MPEGAUDIODATA_H
28
#define FFMPEG_MPEGAUDIODATA_H
29 29

  
30 30
#include "common.h"
31 31

  
......
37 37
extern const int ff_mpa_quant_bits[17];
38 38
extern const unsigned char *ff_mpa_alloc_tables[5];
39 39

  
40
#endif /* MPEGAUDIODATA_H */
40
#endif /* FFMPEG_MPEGAUDIODATA_H */
libavcodec/mpegaudiodecheader.h
24 24
 * MPEG Audio header decoder.
25 25
 */
26 26

  
27
#ifndef MPEGAUDIODECHEADER_H
28
#define MPEGAUDIODECHEADER_H
27
#ifndef FFMPEG_MPEGAUDIODECHEADER_H
28
#define FFMPEG_MPEGAUDIODECHEADER_H
29 29

  
30 30
#include "common.h"
31 31
#include "mpegaudio.h"
......
36 36
   that the frame size must be computed externally */
37 37
int ff_mpegaudio_decode_header(MPADecodeContext *s, uint32_t header);
38 38

  
39
#endif /* MPEGAUDIODECHEADER_H */
39
#endif /* FFMPEG_MPEGAUDIODECHEADER_H */
libavcodec/mpegaudiodectab.h
24 24
 * mpeg audio layer decoder tables.
25 25
 */
26 26

  
27
#ifndef AVCODEC_MPEGAUDIODECTAB_H
28
#define AVCODEC_MPEGAUDIODECTAB_H
27
#ifndef FFMPEG_MPEGAUDIODECTAB_H
28
#define FFMPEG_MPEGAUDIODECTAB_H
29 29

  
30 30
#include <stdint.h>
31 31
#include "mpegaudio.h"
......
603 603
    -0.6, -0.535, -0.33, -0.185, -0.095, -0.041, -0.0142, -0.0037,
604 604
};
605 605

  
606
#endif // AVCODEC_MPEGAUDIODECTAB_H
606
#endif /* FFMPEG_MPEGAUDIODECTAB_H */
libavcodec/mpegaudiotab.h
27 27
 * Most of them come from the mpeg audio specification.
28 28
 */
29 29

  
30
#ifndef AVCODEC_MPEGAUDIOTAB_H
31
#define AVCODEC_MPEGAUDIOTAB_H
30
#ifndef FFMPEG_MPEGAUDIOTAB_H
31
#define FFMPEG_MPEGAUDIOTAB_H
32 32

  
33 33
#include <stdint.h>
34 34
#include "mpegaudio.h"
......
115 115

  
116 116
static const unsigned char nb_scale_factors[4] = { 3, 2, 1, 2 };
117 117

  
118
#endif // AVCODEC_MPEGAUDIOTAB_H
118
#endif /* FFMPEG_MPEGAUDIOTAB_H */
libavcodec/mpegvideo.h
25 25
 * mpegvideo header.
26 26
 */
27 27

  
28
#ifndef AVCODEC_MPEGVIDEO_H
29
#define AVCODEC_MPEGVIDEO_H
28
#ifndef FFMPEG_MPEGVIDEO_H
29
#define FFMPEG_MPEGVIDEO_H
30 30

  
31 31
#include "dsputil.h"
32 32
#include "bitstream.h"
......
898 898
                       DCTELEM block[6][64],
899 899
                       int motion_x, int motion_y);
900 900

  
901
#endif /* AVCODEC_MPEGVIDEO_H */
901
#endif /* FFMPEG_MPEGVIDEO_H */
902 902

  
libavcodec/mpegvideo_common.h
27 27
 * The simplest mpeg encoder (well, it was the simplest!).
28 28
 */
29 29

  
30
#ifndef MPEGVIDEO_COMMON_H
31
#define MPEGVIDEO_COMMON_H
30
#ifndef FFMPEG_MPEGVIDEO_COMMON_H
31
#define FFMPEG_MPEGVIDEO_COMMON_H
32 32

  
33 33
#include "avcodec.h"
34 34
#include "dsputil.h"
......
833 833
    }
834 834
}
835 835

  
836
#endif /* MPEGVIDEO_COMMON_H */
836
#endif /* FFMPEG_MPEGVIDEO_COMMON_H */
libavcodec/msmpeg4.h
23 23
 * @file msmpeg4.h
24 24
 */
25 25

  
26
#ifndef MSMPEG4_H
27
#define MSMPEG4_H
26
#ifndef FFMPEG_MSMPEG4_H
27
#define FFMPEG_MSMPEG4_H
28 28

  
29 29
#include "config.h"
30 30

  
......
41 41
#define ENABLE_WMV_DECODER (ENABLE_WMV1_DECODER || ENABLE_WMV2_DECODER)
42 42
#define ENABLE_WMV_ENCODER (ENABLE_WMV1_ENCODER || ENABLE_WMV2_ENCODER)
43 43

  
44
#endif /* MSMPEG4_H */
44
#endif /* FFMPEG_MSMPEG4_H */
libavcodec/msmpeg4data.h
27 27
 * MSMPEG4 data tables.
28 28
 */
29 29

  
30
#ifndef MSMPEG4DATA_H
31
#define MSMPEG4DATA_H
30
#ifndef FFMPEG_MSMPEG4DATA_H
31
#define FFMPEG_MSMPEG4DATA_H
32 32

  
33 33
#include "common.h"
34 34
#include "bitstream.h"
......
97 97
extern const uint8_t wmv2_scantableA[64];
98 98
extern const uint8_t wmv2_scantableB[64];
99 99

  
100
#endif /* MSMPEG4DATA_H */
100
#endif /* FFMPEG_MSMPEG4DATA_H */
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff