diff options
72 files changed, 180 insertions, 0 deletions
diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index a97ffd162c..622c7eb9dc 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -23,6 +23,9 @@ #ifndef AAC_AC3_PARSER_H #define AAC_AC3_PARSER_H +#include <stdint.h> +#include "avcodec.h" + typedef struct AACAC3ParseContext { uint8_t *inbuf_ptr; int frame_size; diff --git a/libavcodec/atrac3data.h b/libavcodec/atrac3data.h index 0017d60c06..8c12103993 100644 --- a/libavcodec/atrac3data.h +++ b/libavcodec/atrac3data.h @@ -25,6 +25,8 @@ * Atrac 3 AKA RealAudio 8 compatible decoder data */ +#include <stdint.h> + /* VLC tables */ static const uint8_t huffcode1[9] = { diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index dfed0e3ed6..dcaba8ab2c 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -26,6 +26,11 @@ #ifndef BITSTREAM_H #define BITSTREAM_H +#include <stdint.h> +#include <stdlib.h> +#include <assert.h> +#include "common.h" +#include "bswap.h" #include "log.h" #if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) diff --git a/libavcodec/bmp.h b/libavcodec/bmp.h index cf6ace8451..2f0440aba6 100644 --- a/libavcodec/bmp.h +++ b/libavcodec/bmp.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avcodec.h" + typedef struct BMPContext { AVFrame picture; } BMPContext; diff --git a/libavcodec/bytestream.h b/libavcodec/bytestream.h index df4fca3f20..b316f2d3f3 100644 --- a/libavcodec/bytestream.h +++ b/libavcodec/bytestream.h @@ -22,6 +22,8 @@ #ifndef FFMPEG_BYTESTREAM_H #define FFMPEG_BYTESTREAM_H +#include "common.h" + #define DEF(name, bytes, read, write)\ static av_always_inline unsigned int bytestream_get_ ## name(uint8_t **b){\ (*b) += bytes;\ diff --git a/libavcodec/cookdata.h b/libavcodec/cookdata.h index 395c9a7ddf..c376ec8ef5 100644 --- a/libavcodec/cookdata.h +++ b/libavcodec/cookdata.h @@ -26,6 +26,8 @@ * Cook AKA RealAudio G2 compatible decoderdata */ +#include <stdint.h> + /* various data tables */ static const int expbits_tab[8] = { diff --git a/libavcodec/dcadata.h b/libavcodec/dcadata.h index 5466b37b89..288401baec 100644 --- a/libavcodec/dcadata.h +++ b/libavcodec/dcadata.h @@ -24,6 +24,8 @@ * @file dcadata.c */ +#include <stdint.h> + /* Generic tables */ static const uint32_t dca_sample_rates[16] = diff --git a/libavcodec/dcahuff.h b/libavcodec/dcahuff.h index 8a78aee7e8..2833d6789a 100644 --- a/libavcodec/dcahuff.h +++ b/libavcodec/dcahuff.h @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> +#include <stdlib.h> + #define TMODE_COUNT 4 static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 }; static const uint16_t tmode_codes[TMODE_COUNT][4] = { diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h index 5d5aa528b5..cc0c07dd2f 100644 --- a/libavcodec/dnxhddata.h +++ b/libavcodec/dnxhddata.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint8_t dnxhd_1238_luma_weigth[] = { 0, 32, 32, 33, 34, 33, 33, 33, 33, 33, 33, 33, 33, 35, 37, 37, diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h index 96adab198c..4484933a01 100644 --- a/libavcodec/dvdata.h +++ b/libavcodec/dvdata.h @@ -24,6 +24,9 @@ * Constants for DV codec. */ +#include "avcodec.h" +#include "rational.h" + /* * DVprofile is used to express the differences between various * DV flavors. For now it's primarily used for differentiating diff --git a/libavcodec/faandct.h b/libavcodec/faandct.h index 77dd41daec..a7b11dc365 100644 --- a/libavcodec/faandct.h +++ b/libavcodec/faandct.h @@ -27,6 +27,8 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ +#include "dsputil.h" + #define FAAN_POSTSCALE void ff_faandct(DCTELEM * data); diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 9bf7aec466..b4382d236b 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -28,6 +28,9 @@ * @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi */ +#include <stdint.h> +#include "bitstream.h" + #define INVALID_VLC 0x80000000 extern const uint8_t ff_golomb_vlc_len[512]; diff --git a/libavcodec/h261data.h b/libavcodec/h261data.h index 9be1eeb5b2..a7074eb0c6 100644 --- a/libavcodec/h261data.h +++ b/libavcodec/h261data.h @@ -24,6 +24,9 @@ * H.261 tables. */ +#include <stdint.h> +#include "h261.h" + // H.261 VLC table for macroblock addressing static const uint8_t h261_mba_code[35] = { 1, 3, 2, 3, diff --git a/libavcodec/h263_parser.h b/libavcodec/h263_parser.h index 83df378787..afd46fda05 100644 --- a/libavcodec/h263_parser.h +++ b/libavcodec/h263_parser.h @@ -19,4 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "parser.h" + int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); diff --git a/libavcodec/h263data.h b/libavcodec/h263data.h index 5eddc3b549..e0366aaf98 100644 --- a/libavcodec/h263data.h +++ b/libavcodec/h263data.h @@ -26,6 +26,8 @@ * H.263 tables. */ +#include <stdint.h> +#include "mpegvideo.h" /* intra MCBPC, mb_type = (intra), then (intraq) */ const uint8_t intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 }; diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h index 74e720421b..c9e71853fc 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -27,6 +27,10 @@ * @author Michael Niedermayer <michaelni@gmx.at> */ +#include <stdint.h> +#include "mpegvideo.h" +#include "rational.h" + #define VERT_PRED 0 #define HOR_PRED 1 #define DC_PRED 2 diff --git a/libavcodec/imcdata.h b/libavcodec/imcdata.h index 92ed275f17..446bf0b176 100644 --- a/libavcodec/imcdata.h +++ b/libavcodec/imcdata.h @@ -22,6 +22,8 @@ * */ +#include <stdint.h> + static const uint16_t band_tab[33] = { 0, 3, 6, 9, 12, 16, 20, 24, 29, 34, 40, 46, 53, 60, 68, 76, 84, 93, 102, 111, 121, 131, diff --git a/libavcodec/indeo2data.h b/libavcodec/indeo2data.h index 71d250af7b..83d1227b3f 100644 --- a/libavcodec/indeo2data.h +++ b/libavcodec/indeo2data.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #define IR2_CODES 143 static const uint16_t ir2_codes[IR2_CODES][2] = { #ifdef ALT_BITSTREAM_READER_LE diff --git a/libavcodec/indeo3data.h b/libavcodec/indeo3data.h index e69a09f0e5..095e3f00d0 100644 --- a/libavcodec/indeo3data.h +++ b/libavcodec/indeo3data.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint32_t correction[] = { 0x00000000, 0x00000202, 0xfffffdfe, 0x000002ff, 0xfffffd01, 0xffffff03, 0x000000fd, 0x00000404, 0xfffffbfc, 0x00000501, 0xfffffaff, 0x00000105, 0xfffffefb, 0x000003fc, 0xfffffc04, 0x000005fe, diff --git a/libavcodec/jpeglsdec.h b/libavcodec/jpeglsdec.h index d953aa4a78..c5766184ff 100644 --- a/libavcodec/jpeglsdec.h +++ b/libavcodec/jpeglsdec.h @@ -29,6 +29,7 @@ #define JPEGLSDEC_H #include "mjpeg.h" +#include "mjpegdec.h" /** * Decode LSE block with initialization parameters diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index c6ec705977..e6ff1e6a5c 100644 --- a/libavcodec/mathops.h +++ b/libavcodec/mathops.h @@ -22,6 +22,8 @@ #ifndef MATHOPS_H #define MATHOPS_H +#include "common.h" + #ifdef ARCH_X86_32 #include "i386/mathops.h" diff --git a/libavcodec/mpcdata.h b/libavcodec/mpcdata.h index 2b74765edb..6316627fd9 100644 --- a/libavcodec/mpcdata.h +++ b/libavcodec/mpcdata.h @@ -20,6 +20,8 @@ * */ +#include <stdint.h> + static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1}; static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1}; static const int8_t mpc_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}; diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index 1176a75fa7..2cbc37fa98 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -25,6 +25,9 @@ * MPEG1/2 tables. */ +#include <stdint.h> +#include "mpegvideo.h" + const uint16_t ff_mpeg1_default_intra_matrix[64] = { 8, 16, 19, 22, 26, 27, 29, 34, 16, 16, 22, 24, 27, 29, 34, 37, diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index e79216b6d9..17a52dd021 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -25,6 +25,9 @@ * mpeg4 tables. */ +#include <stdint.h> +#include "mpegvideo.h" + // shapes #define RECT_SHAPE 0 #define BIN_SHAPE 1 diff --git a/libavcodec/mpegaudiodectab.h b/libavcodec/mpegaudiodectab.h index de0ad50ace..7dac9e64c3 100644 --- a/libavcodec/mpegaudiodectab.h +++ b/libavcodec/mpegaudiodectab.h @@ -24,6 +24,9 @@ * mpeg audio layer decoder tables. */ +#include <stdint.h> +#include "mpegaudio.h" + /*******************************************************/ /* layer 3 tables */ diff --git a/libavcodec/mpegaudiotab.h b/libavcodec/mpegaudiotab.h index 8fb37ddffa..6833f3c70a 100644 --- a/libavcodec/mpegaudiotab.h +++ b/libavcodec/mpegaudiotab.h @@ -27,6 +27,9 @@ * Most of them come from the mpeg audio specification. */ +#include <stdint.h> +#include "mpegaudio.h" + #define SQRT2 1.41421356237309514547 static const int costab32[30] = { diff --git a/libavcodec/msmpeg4tab.h b/libavcodec/msmpeg4tab.h index dda7fbdaa0..5db3f35c3d 100644 --- a/libavcodec/msmpeg4tab.h +++ b/libavcodec/msmpeg4tab.h @@ -27,6 +27,10 @@ * MSMPEG4 data tables. */ +#include <stdint.h> +#include "bitstream.h" +#include "rl.h" + /* non intra picture macro block coded block pattern + mb type */ static const uint32_t table_mb_non_intra[128][2] = { { 0x40, 7 },{ 0x13c9, 13 },{ 0x9fd, 12 },{ 0x1fc, 15 }, diff --git a/libavcodec/opt.h b/libavcodec/opt.h index 151dbb788e..65d0b45453 100644 --- a/libavcodec/opt.h +++ b/libavcodec/opt.h @@ -27,6 +27,8 @@ * AVOptions */ +#include "rational.h" + enum AVOptionType{ FF_OPT_TYPE_FLAGS, FF_OPT_TYPE_INT, diff --git a/libavcodec/qdm2data.h b/libavcodec/qdm2data.h index 6d7d074630..410ec468f6 100644 --- a/libavcodec/qdm2data.h +++ b/libavcodec/qdm2data.h @@ -31,6 +31,8 @@ #ifndef QDM2DATA_H #define QDM2DATA_H +#include <stdint.h> + /** VLC TABLES **/ /* values in this table range from -1..23; adjust retrieved value by -1 */ diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h index 7844058ba0..a2fac35519 100644 --- a/libavcodec/rangecoder.h +++ b/libavcodec/rangecoder.h @@ -25,6 +25,10 @@ * Range coder. */ +#include <stdint.h> +#include <assert.h> +#include "common.h" + typedef struct RangeCoder{ int low; int range; diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index c428923a5d..a1017751e2 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -28,6 +28,8 @@ * ratecontrol header. */ +#include <stdio.h> +#include <stdint.h> #include "eval.h" typedef struct Predictor{ diff --git a/libavcodec/rl.h b/libavcodec/rl.h index 1c2aae25ae..dd3e86c9c4 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -6,6 +6,10 @@ #ifndef AVCODEC_RL_H #define AVCODEC_RL_H +#include <stdint.h> +#include "bitstream.h" +#include "mpegvideo.h" + /** RLTable. */ typedef struct RLTable { int n; ///< number of entries of table_vlc minus 1 diff --git a/libavcodec/rle.h b/libavcodec/rle.h index 929dc9090d..edee8e130e 100644 --- a/libavcodec/rle.h +++ b/libavcodec/rle.h @@ -22,6 +22,8 @@ #ifndef RLE_H #define RLE_H +#include <stdint.h> + /** * RLE compress the row, with maximum size of out_size. Value before repeated bytes is (count ^ xor_rep) + add_rep. * Value before raw bytes is (count ^ xor_raw) + add_raw. diff --git a/libavcodec/rtjpeg.h b/libavcodec/rtjpeg.h index daecc8a75a..c36a54f8b4 100644 --- a/libavcodec/rtjpeg.h +++ b/libavcodec/rtjpeg.h @@ -22,6 +22,9 @@ #ifndef RTJPEG_H #define RTJPEG_H +#include <stdint.h> +#include <dsputil.h> + typedef struct { int w, h; DSPContext *dsp; diff --git a/libavcodec/s3tc.h b/libavcodec/s3tc.h index b9808791d1..55615f4aa4 100644 --- a/libavcodec/s3tc.h +++ b/libavcodec/s3tc.h @@ -23,6 +23,8 @@ #ifndef FF_S3TC_H #define FF_S3TC_H +#include <stdint.h> + #define FF_S3TC_DXT1 0x31545844 #define FF_S3TC_DXT3 0x33545844 diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h index c4b4533292..63e19519f0 100644 --- a/libavcodec/simple_idct.h +++ b/libavcodec/simple_idct.h @@ -25,6 +25,9 @@ * simple idct header. */ +#include <stdint.h> +#include "dsputil.h" + void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block); void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct_mmx(int16_t *block); diff --git a/libavcodec/sp5x.h b/libavcodec/sp5x.h index 0d0d3551f1..7916d1b607 100644 --- a/libavcodec/sp5x.h +++ b/libavcodec/sp5x.h @@ -22,6 +22,8 @@ #ifndef SP5X_H #define SP5X_H +#include <stdint.h> + static const uint8_t sp5x_data_sof[] = { 0xFF, 0xC0, /* SOF */ diff --git a/libavcodec/svq1_cb.h b/libavcodec/svq1_cb.h index a0748bd444..9b23d8ebdb 100644 --- a/libavcodec/svq1_cb.h +++ b/libavcodec/svq1_cb.h @@ -29,6 +29,9 @@ * svq1 code books. */ +#include <stdint.h> +#include <stdlib.h> + /* 6x16-entry codebook for inter-coded 4x2 vectors */ static const int8_t svq1_inter_codebook_4x2[768] = { 7, 2, -6, -7, 7, 3, -3, -4, -7, -2, 7, 8, -8, -4, 3, 4, diff --git a/libavcodec/svq1_vlc.h b/libavcodec/svq1_vlc.h index 56463700ff..b7776e627e 100644 --- a/libavcodec/svq1_vlc.h +++ b/libavcodec/svq1_vlc.h @@ -21,6 +21,8 @@ #ifndef SVQ1_VLC_H #define SVQ1_VLC_H +#include <stdint.h> + /* values in this table range from 0..3; adjust retrieved value by +0 */ static const uint8_t svq1_block_type_vlc[4][2] = { /* { code, length } */ diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h index 4e51de24d3..09ba3fd9db 100644 --- a/libavcodec/tiff.h +++ b/libavcodec/tiff.h @@ -28,6 +28,8 @@ #ifndef TIFF_H #define TIFF_H +#include <stdint.h> + /** abridged list of TIFF tags */ enum TiffTags{ TIFF_SUBFILE = 0xfe, diff --git a/libavcodec/truemotion1data.h b/libavcodec/truemotion1data.h index 63d307c652..f8355e2bc5 100644 --- a/libavcodec/truemotion1data.h +++ b/libavcodec/truemotion1data.h @@ -25,6 +25,9 @@ #ifndef TRUEMOTION1DATA_H #define TRUEMOTION1DATA_H +#include <stdint.h> +#include <stdlib.h> + /* Y delta tables, skinny and fat */ static const int16_t ydt1[8] = { 0, -2, 2, -6, 6, -12, 12, -12 }; static const int16_t ydt2[8] = { 0, -2, 4, -6, 8, -12, 12, -12 }; diff --git a/libavcodec/truespeech_data.h b/libavcodec/truespeech_data.h index cd8822fdeb..73b94dbdd5 100644 --- a/libavcodec/truespeech_data.h +++ b/libavcodec/truespeech_data.h @@ -22,6 +22,8 @@ #ifndef __TRUESPEECH_DATA__ #define __TRUESPEECH_DATA__ +#include <stdint.h> + /* codebooks fo expanding input filter */ static const int16_t ts_cb_0[32] = { 0x8240, 0x8364, 0x84CE, 0x865D, 0x8805, 0x89DE, 0x8BD7, 0x8DF4, diff --git a/libavcodec/vc1acdata.h b/libavcodec/vc1acdata.h index a6acecd78e..72f1a8fc7f 100644 --- a/libavcodec/vc1acdata.h +++ b/libavcodec/vc1acdata.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #define AC_MODES 8 static const int vc1_ac_sizes[AC_MODES] = { diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index b2ca961999..786e311035 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -28,6 +28,10 @@ #ifndef VC1DATA_H #define VC1DATA_H +#include <stdint.h> +#include "bitstream.h" +#include "rational.h" + /** Table for conversion between TTBLK and TTMB */ extern const int ff_vc1_ttblk_to_tt[3][8]; diff --git a/libavcodec/vorbis_enc_data.h b/libavcodec/vorbis_enc_data.h index e56dc5df58..5d5e4cad90 100644 --- a/libavcodec/vorbis_enc_data.h +++ b/libavcodec/vorbis_enc_data.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint8_t codebook0[] = { 2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 13, diff --git a/libavcodec/vp3data.h b/libavcodec/vp3data.h index d69ddfa281..77bdd7ac77 100644 --- a/libavcodec/vp3data.h +++ b/libavcodec/vp3data.h @@ -21,6 +21,9 @@ #ifndef VP3DATA_H #define VP3DATA_H +#include <stdint.h> +#include <stdlib.h> + /* these coefficients dequantize intraframe Y plane coefficients * (note: same as JPEG) */ static const int16_t vp31_intra_y_dequant[64] = diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h index effc17c2ca..1474873bde 100644 --- a/libavcodec/vp5data.h +++ b/libavcodec/vp5data.h @@ -24,6 +24,8 @@ #ifndef VP5DATA_H #define VP5DATA_H +#include <stdint.h> + static const uint8_t vp5_coeff_groups[] = { -1, 0, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, diff --git a/libavcodec/wmadata.h b/libavcodec/wmadata.h index 31ed89bf07..d81ba8496b 100644 --- a/libavcodec/wmadata.h +++ b/libavcodec/wmadata.h @@ -24,6 +24,9 @@ * Various WMA tables. */ +#include <stdint.h> +#include "wma.h" + static const uint16_t wma_critical_freqs[25] = { 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150, diff --git a/libavformat/allformats.h b/libavformat/allformats.h index 2185d36a94..fec5038580 100644 --- a/libavformat/allformats.h +++ b/libavformat/allformats.h @@ -22,6 +22,8 @@ #ifndef ALLFORMATS_H #define ALLFORMATS_H +#include "avformat.h" + extern AVInputFormat aac_demuxer; extern AVInputFormat ac3_demuxer; extern AVInputFormat aiff_demuxer; diff --git a/libavformat/asf.h b/libavformat/asf.h index 6d76ebecb2..3421a08962 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -17,6 +17,10 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <stdint.h> +#include "avformat.h" + #define PACKET_SIZE 3200 typedef struct { diff --git a/libavformat/avio.h b/libavformat/avio.h index 8e04545e28..8db657f282 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -21,6 +21,8 @@ #ifndef AVIO_H #define AVIO_H +#include <stdint.h> + /* output byte stream handling */ typedef int64_t offset_t; diff --git a/libavformat/dv.h b/libavformat/dv.h index 2fa30036cc..5bc12865e8 100644 --- a/libavformat/dv.h +++ b/libavformat/dv.h @@ -25,6 +25,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avformat.h" + typedef struct DVDemuxContext DVDemuxContext; DVDemuxContext* dv_init_demux(AVFormatContext* s); int dv_get_packet(DVDemuxContext*, AVPacket *); diff --git a/libavformat/isom.h b/libavformat/isom.h index 9fa49e7304..5370241288 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -24,6 +24,8 @@ #ifndef FFMPEG_ISOM_H #define FFMPEG_ISOM_H +#include "riff.h" + /* isom.c */ extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag codec_movvideo_tags[]; diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index 771becbd4b..fc0fd11548 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avformat.h" + #define TS_FEC_PACKET_SIZE 204 #define TS_DVHS_PACKET_SIZE 192 #define TS_PACKET_SIZE 188 diff --git a/libavformat/riff.h b/libavformat/riff.h index cd2b85d85f..863aec10a3 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -28,6 +28,9 @@ #ifndef FF_RIFF_H #define FF_RIFF_H +#include "avcodec.h" +#include "avio.h" + offset_t start_tag(ByteIOContext *pb, const char *tag); void end_tag(ByteIOContext *pb, offset_t start); diff --git a/libavformat/rtp.h b/libavformat/rtp.h index fec7630517..dc91de5a56 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -21,6 +21,9 @@ #ifndef RTP_H #define RTP_H +#include "avcodec.h" +#include "avformat.h" + #define RTP_MIN_PACKET_LENGTH 12 #define RTP_MAX_PACKET_LENGTH 1500 /* XXX: suppress this define */ diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h index 19508574db..f12809bc3c 100644 --- a/libavformat/rtp_h264.h +++ b/libavformat/rtp_h264.h @@ -22,5 +22,7 @@ #ifndef RTP_H264_H #define RTP_H264_H +#include "rtp_internal.h" + extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; #endif /* RTP_H264_H */ diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h index 3edcf49c8a..882098faba 100644 --- a/libavformat/rtp_internal.h +++ b/libavformat/rtp_internal.h @@ -23,6 +23,10 @@ #ifndef RTP_INTERNAL_H #define RTP_INTERNAL_H +#include <stdint.h> +#include "avcodec.h" +#include "rtp.h" + // these statistics are used for rtcp receiver reports... typedef struct { uint16_t max_seq; ///< highest sequence number seen diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index ddf2448e26..3321440add 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -21,6 +21,8 @@ #ifndef RTSP_H #define RTSP_H +#include <stdint.h> +#include "avformat.h" #include "rtspcodes.h" enum RTSPProtocol { diff --git a/libavutil/adler32.h b/libavutil/adler32.h index f56d416fb8..223cbfd223 100644 --- a/libavutil/adler32.h +++ b/libavutil/adler32.h @@ -21,6 +21,8 @@ #ifndef ADLER32_H #define ADLER32_H +#include <stdint.h> + unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len); diff --git a/libavutil/aes.h b/libavutil/aes.h index 39a38b724d..a4ee1f9659 100644 --- a/libavutil/aes.h +++ b/libavutil/aes.h @@ -21,6 +21,8 @@ #ifndef AES_H #define AES_H +#include <stdint.h> + extern const int av_aes_size; struct AVAES; diff --git a/libavutil/base64.h b/libavutil/base64.h index 3d905313cf..7f21c71c71 100644 --- a/libavutil/base64.h +++ b/libavutil/base64.h @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + /** * decodes base64 * param order as strncpy() diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 7bca81492c..3b6c2c0407 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -26,6 +26,9 @@ #ifndef __BSWAP_H__ #define __BSWAP_H__ +#include <stdint.h> +#include "common.h" + #ifdef HAVE_BYTESWAP_H #include <byteswap.h> #else diff --git a/libavutil/crc.h b/libavutil/crc.h index 1f6431992b..11c4fd09b0 100644 --- a/libavutil/crc.h +++ b/libavutil/crc.h @@ -21,6 +21,9 @@ #ifndef CRC_H #define CRC_H +#include <stdint.h> +#include <sys/types.h> + typedef uint32_t AVCRC; #if LIBAVUTIL_VERSION_INT < (50<<16) diff --git a/libavutil/fifo.h b/libavutil/fifo.h index e1e85293dd..278a8c82f3 100644 --- a/libavutil/fifo.h +++ b/libavutil/fifo.h @@ -24,6 +24,8 @@ #ifndef FIFO_H #define FIFO_H +#include <stdint.h> + typedef struct AVFifoBuffer { uint8_t *buffer; uint8_t *rptr, *wptr, *end; diff --git a/libavutil/integer.h b/libavutil/integer.h index 2a4d703166..2a6f8b0279 100644 --- a/libavutil/integer.h +++ b/libavutil/integer.h @@ -29,6 +29,8 @@ #ifndef INTEGER_H #define INTEGER_H +#include <stdint.h> + #define AV_INTEGER_SIZE 8 typedef struct AVInteger{ diff --git a/libavutil/internal.h b/libavutil/internal.h index 67f9fe6d9e..7a97f54782 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -26,6 +26,9 @@ #ifndef INTERNAL_H #define INTERNAL_H +#include <stdint.h> +#include <assert.h> + #ifndef attribute_used #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) # define attribute_used __attribute__((used)) diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 495cb54062..6e265eaa17 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -19,6 +19,8 @@ #ifndef INTREADWRITE_H #define INTREADWRITE_H +#include <stdint.h> + #ifdef __GNUC__ struct unaligned_64 { uint64_t l; } __attribute__((packed)); diff --git a/libavutil/md5.h b/libavutil/md5.h index 8d1b4b5fe7..fa83b1cdfe 100644 --- a/libavutil/md5.h +++ b/libavutil/md5.h @@ -21,6 +21,8 @@ #ifndef MD5_H #define MD5_H +#include <stdint.h> + extern const int av_md5_size; struct AVMD5; diff --git a/libavutil/rational.h b/libavutil/rational.h index 63c0b150f2..8aaba667aa 100644 --- a/libavutil/rational.h +++ b/libavutil/rational.h @@ -29,6 +29,8 @@ #ifndef RATIONAL_H #define RATIONAL_H +#include <stdint.h> + /** * Rational number num/den. */ diff --git a/libavutil/sha1.h b/libavutil/sha1.h index 8739cbde93..181cf79bd9 100644 --- a/libavutil/sha1.h +++ b/libavutil/sha1.h @@ -1,6 +1,8 @@ #ifndef AV_SHA1_H #define AV_SHA1_H +#include <stdint.h> + extern const int av_sha1_size; struct AVSHA1; diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h index 5bb2c1cbc8..422c1b3d6d 100644 --- a/libavutil/softfloat.h +++ b/libavutil/softfloat.h @@ -19,6 +19,8 @@ * */ +#include <stdint.h> + #define MIN_EXP -126 #define MAX_EXP 126 #define ONE_BITS 29 |