# HG changeset patch # User mru # Date 1182034753 0 # Node ID 4394344397d8d3e4cb5f302e2434eb66bf80b628 # Parent 94c3f01c243cdd1fb10fdd2485a7c339fb9ad2a4 include all prerequisites in header files diff -r 94c3f01c243c -r 4394344397d8 aac_ac3_parser.h --- a/aac_ac3_parser.h Sat Jun 16 22:58:43 2007 +0000 +++ b/aac_ac3_parser.h Sat Jun 16 22:59:13 2007 +0000 @@ -23,6 +23,9 @@ #ifndef AAC_AC3_PARSER_H #define AAC_AC3_PARSER_H +#include +#include "avcodec.h" + typedef struct AACAC3ParseContext { uint8_t *inbuf_ptr; int frame_size; diff -r 94c3f01c243c -r 4394344397d8 atrac3data.h --- a/atrac3data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/atrac3data.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,8 @@ * Atrac 3 AKA RealAudio 8 compatible decoder data */ +#include + /* VLC tables */ static const uint8_t huffcode1[9] = { diff -r 94c3f01c243c -r 4394344397d8 bitstream.h --- a/bitstream.h Sat Jun 16 22:58:43 2007 +0000 +++ b/bitstream.h Sat Jun 16 22:59:13 2007 +0000 @@ -26,6 +26,11 @@ #ifndef BITSTREAM_H #define BITSTREAM_H +#include +#include +#include +#include "common.h" +#include "bswap.h" #include "log.h" #if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) diff -r 94c3f01c243c -r 4394344397d8 bmp.h --- a/bmp.h Sat Jun 16 22:58:43 2007 +0000 +++ b/bmp.h Sat Jun 16 22:59:13 2007 +0000 @@ -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 -r 94c3f01c243c -r 4394344397d8 bytestream.h --- a/bytestream.h Sat Jun 16 22:58:43 2007 +0000 +++ b/bytestream.h Sat Jun 16 22:59:13 2007 +0000 @@ -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 -r 94c3f01c243c -r 4394344397d8 cookdata.h --- a/cookdata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/cookdata.h Sat Jun 16 22:59:13 2007 +0000 @@ -26,6 +26,8 @@ * Cook AKA RealAudio G2 compatible decoderdata */ +#include + /* various data tables */ static const int expbits_tab[8] = { diff -r 94c3f01c243c -r 4394344397d8 dcadata.h --- a/dcadata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/dcadata.h Sat Jun 16 22:59:13 2007 +0000 @@ -24,6 +24,8 @@ * @file dcadata.c */ +#include + /* Generic tables */ static const uint32_t dca_sample_rates[16] = diff -r 94c3f01c243c -r 4394344397d8 dcahuff.h --- a/dcahuff.h Sat Jun 16 22:58:43 2007 +0000 +++ b/dcahuff.h Sat Jun 16 22:59:13 2007 +0000 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #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 -r 94c3f01c243c -r 4394344397d8 dnxhddata.h --- a/dnxhddata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/dnxhddata.h Sat Jun 16 22:59:13 2007 +0000 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + 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 -r 94c3f01c243c -r 4394344397d8 dvdata.h --- a/dvdata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/dvdata.h Sat Jun 16 22:59:13 2007 +0000 @@ -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 -r 94c3f01c243c -r 4394344397d8 faandct.h --- a/faandct.h Sat Jun 16 22:58:43 2007 +0000 +++ b/faandct.h Sat Jun 16 22:59:13 2007 +0000 @@ -27,6 +27,8 @@ * @author Michael Niedermayer */ +#include "dsputil.h" + #define FAAN_POSTSCALE void ff_faandct(DCTELEM * data); diff -r 94c3f01c243c -r 4394344397d8 golomb.h --- a/golomb.h Sat Jun 16 22:58:43 2007 +0000 +++ b/golomb.h Sat Jun 16 22:59:13 2007 +0000 @@ -28,6 +28,9 @@ * @author Michael Niedermayer and Alex Beregszaszi */ +#include +#include "bitstream.h" + #define INVALID_VLC 0x80000000 extern const uint8_t ff_golomb_vlc_len[512]; diff -r 94c3f01c243c -r 4394344397d8 h261data.h --- a/h261data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/h261data.h Sat Jun 16 22:59:13 2007 +0000 @@ -24,6 +24,9 @@ * H.261 tables. */ +#include +#include "h261.h" + // H.261 VLC table for macroblock addressing static const uint8_t h261_mba_code[35] = { 1, 3, 2, 3, diff -r 94c3f01c243c -r 4394344397d8 h263_parser.h --- a/h263_parser.h Sat Jun 16 22:58:43 2007 +0000 +++ b/h263_parser.h Sat Jun 16 22:59:13 2007 +0000 @@ -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 -r 94c3f01c243c -r 4394344397d8 h263data.h --- a/h263data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/h263data.h Sat Jun 16 22:59:13 2007 +0000 @@ -26,6 +26,8 @@ * H.263 tables. */ +#include +#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 -r 94c3f01c243c -r 4394344397d8 h264data.h --- a/h264data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/h264data.h Sat Jun 16 22:59:13 2007 +0000 @@ -27,6 +27,10 @@ * @author Michael Niedermayer */ +#include +#include "mpegvideo.h" +#include "rational.h" + #define VERT_PRED 0 #define HOR_PRED 1 #define DC_PRED 2 diff -r 94c3f01c243c -r 4394344397d8 imcdata.h --- a/imcdata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/imcdata.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,8 @@ * */ +#include + 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 -r 94c3f01c243c -r 4394344397d8 indeo2data.h --- a/indeo2data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/indeo2data.h Sat Jun 16 22:59:13 2007 +0000 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #define IR2_CODES 143 static const uint16_t ir2_codes[IR2_CODES][2] = { #ifdef ALT_BITSTREAM_READER_LE diff -r 94c3f01c243c -r 4394344397d8 indeo3data.h --- a/indeo3data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/indeo3data.h Sat Jun 16 22:59:13 2007 +0000 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + static const uint32_t correction[] = { 0x00000000, 0x00000202, 0xfffffdfe, 0x000002ff, 0xfffffd01, 0xffffff03, 0x000000fd, 0x00000404, 0xfffffbfc, 0x00000501, 0xfffffaff, 0x00000105, 0xfffffefb, 0x000003fc, 0xfffffc04, 0x000005fe, diff -r 94c3f01c243c -r 4394344397d8 jpeglsdec.h --- a/jpeglsdec.h Sat Jun 16 22:58:43 2007 +0000 +++ b/jpeglsdec.h Sat Jun 16 22:59:13 2007 +0000 @@ -29,6 +29,7 @@ #define JPEGLSDEC_H #include "mjpeg.h" +#include "mjpegdec.h" /** * Decode LSE block with initialization parameters diff -r 94c3f01c243c -r 4394344397d8 mathops.h --- a/mathops.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mathops.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,8 @@ #ifndef MATHOPS_H #define MATHOPS_H +#include "common.h" + #ifdef ARCH_X86_32 #include "i386/mathops.h" diff -r 94c3f01c243c -r 4394344397d8 mpcdata.h --- a/mpcdata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mpcdata.h Sat Jun 16 22:59:13 2007 +0000 @@ -20,6 +20,8 @@ * */ +#include + 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 -r 94c3f01c243c -r 4394344397d8 mpeg12data.h --- a/mpeg12data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mpeg12data.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,9 @@ * MPEG1/2 tables. */ +#include +#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 -r 94c3f01c243c -r 4394344397d8 mpeg4data.h --- a/mpeg4data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mpeg4data.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,9 @@ * mpeg4 tables. */ +#include +#include "mpegvideo.h" + // shapes #define RECT_SHAPE 0 #define BIN_SHAPE 1 diff -r 94c3f01c243c -r 4394344397d8 mpegaudiodectab.h --- a/mpegaudiodectab.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mpegaudiodectab.h Sat Jun 16 22:59:13 2007 +0000 @@ -24,6 +24,9 @@ * mpeg audio layer decoder tables. */ +#include +#include "mpegaudio.h" + /*******************************************************/ /* layer 3 tables */ diff -r 94c3f01c243c -r 4394344397d8 mpegaudiotab.h --- a/mpegaudiotab.h Sat Jun 16 22:58:43 2007 +0000 +++ b/mpegaudiotab.h Sat Jun 16 22:59:13 2007 +0000 @@ -27,6 +27,9 @@ * Most of them come from the mpeg audio specification. */ +#include +#include "mpegaudio.h" + #define SQRT2 1.41421356237309514547 static const int costab32[30] = { diff -r 94c3f01c243c -r 4394344397d8 msmpeg4tab.h --- a/msmpeg4tab.h Sat Jun 16 22:58:43 2007 +0000 +++ b/msmpeg4tab.h Sat Jun 16 22:59:13 2007 +0000 @@ -27,6 +27,10 @@ * MSMPEG4 data tables. */ +#include +#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 -r 94c3f01c243c -r 4394344397d8 opt.h --- a/opt.h Sat Jun 16 22:58:43 2007 +0000 +++ b/opt.h Sat Jun 16 22:59:13 2007 +0000 @@ -27,6 +27,8 @@ * AVOptions */ +#include "rational.h" + enum AVOptionType{ FF_OPT_TYPE_FLAGS, FF_OPT_TYPE_INT, diff -r 94c3f01c243c -r 4394344397d8 qdm2data.h --- a/qdm2data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/qdm2data.h Sat Jun 16 22:59:13 2007 +0000 @@ -31,6 +31,8 @@ #ifndef QDM2DATA_H #define QDM2DATA_H +#include + /** VLC TABLES **/ /* values in this table range from -1..23; adjust retrieved value by -1 */ diff -r 94c3f01c243c -r 4394344397d8 rangecoder.h --- a/rangecoder.h Sat Jun 16 22:58:43 2007 +0000 +++ b/rangecoder.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,10 @@ * Range coder. */ +#include +#include +#include "common.h" + typedef struct RangeCoder{ int low; int range; diff -r 94c3f01c243c -r 4394344397d8 ratecontrol.h --- a/ratecontrol.h Sat Jun 16 22:58:43 2007 +0000 +++ b/ratecontrol.h Sat Jun 16 22:59:13 2007 +0000 @@ -28,6 +28,8 @@ * ratecontrol header. */ +#include +#include #include "eval.h" typedef struct Predictor{ diff -r 94c3f01c243c -r 4394344397d8 rl.h --- a/rl.h Sat Jun 16 22:58:43 2007 +0000 +++ b/rl.h Sat Jun 16 22:59:13 2007 +0000 @@ -6,6 +6,10 @@ #ifndef AVCODEC_RL_H #define AVCODEC_RL_H +#include +#include "bitstream.h" +#include "mpegvideo.h" + /** RLTable. */ typedef struct RLTable { int n; ///< number of entries of table_vlc minus 1 diff -r 94c3f01c243c -r 4394344397d8 rle.h --- a/rle.h Sat Jun 16 22:58:43 2007 +0000 +++ b/rle.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,8 @@ #ifndef RLE_H #define RLE_H +#include + /** * 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 -r 94c3f01c243c -r 4394344397d8 rtjpeg.h --- a/rtjpeg.h Sat Jun 16 22:58:43 2007 +0000 +++ b/rtjpeg.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,9 @@ #ifndef RTJPEG_H #define RTJPEG_H +#include +#include + typedef struct { int w, h; DSPContext *dsp; diff -r 94c3f01c243c -r 4394344397d8 s3tc.h --- a/s3tc.h Sat Jun 16 22:58:43 2007 +0000 +++ b/s3tc.h Sat Jun 16 22:59:13 2007 +0000 @@ -23,6 +23,8 @@ #ifndef FF_S3TC_H #define FF_S3TC_H +#include + #define FF_S3TC_DXT1 0x31545844 #define FF_S3TC_DXT3 0x33545844 diff -r 94c3f01c243c -r 4394344397d8 simple_idct.h --- a/simple_idct.h Sat Jun 16 22:58:43 2007 +0000 +++ b/simple_idct.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,9 @@ * simple idct header. */ +#include +#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 -r 94c3f01c243c -r 4394344397d8 sp5x.h --- a/sp5x.h Sat Jun 16 22:58:43 2007 +0000 +++ b/sp5x.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,8 @@ #ifndef SP5X_H #define SP5X_H +#include + static const uint8_t sp5x_data_sof[] = { 0xFF, 0xC0, /* SOF */ diff -r 94c3f01c243c -r 4394344397d8 svq1_cb.h --- a/svq1_cb.h Sat Jun 16 22:58:43 2007 +0000 +++ b/svq1_cb.h Sat Jun 16 22:59:13 2007 +0000 @@ -29,6 +29,9 @@ * svq1 code books. */ +#include +#include + /* 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 -r 94c3f01c243c -r 4394344397d8 svq1_vlc.h --- a/svq1_vlc.h Sat Jun 16 22:58:43 2007 +0000 +++ b/svq1_vlc.h Sat Jun 16 22:59:13 2007 +0000 @@ -21,6 +21,8 @@ #ifndef SVQ1_VLC_H #define SVQ1_VLC_H +#include + /* 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 -r 94c3f01c243c -r 4394344397d8 tiff.h --- a/tiff.h Sat Jun 16 22:58:43 2007 +0000 +++ b/tiff.h Sat Jun 16 22:59:13 2007 +0000 @@ -28,6 +28,8 @@ #ifndef TIFF_H #define TIFF_H +#include + /** abridged list of TIFF tags */ enum TiffTags{ TIFF_SUBFILE = 0xfe, diff -r 94c3f01c243c -r 4394344397d8 truemotion1data.h --- a/truemotion1data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/truemotion1data.h Sat Jun 16 22:59:13 2007 +0000 @@ -25,6 +25,9 @@ #ifndef TRUEMOTION1DATA_H #define TRUEMOTION1DATA_H +#include +#include + /* 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 -r 94c3f01c243c -r 4394344397d8 truespeech_data.h --- a/truespeech_data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/truespeech_data.h Sat Jun 16 22:59:13 2007 +0000 @@ -22,6 +22,8 @@ #ifndef __TRUESPEECH_DATA__ #define __TRUESPEECH_DATA__ +#include + /* codebooks fo expanding input filter */ static const int16_t ts_cb_0[32] = { 0x8240, 0x8364, 0x84CE, 0x865D, 0x8805, 0x89DE, 0x8BD7, 0x8DF4, diff -r 94c3f01c243c -r 4394344397d8 vc1acdata.h --- a/vc1acdata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/vc1acdata.h Sat Jun 16 22:59:13 2007 +0000 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #define AC_MODES 8 static const int vc1_ac_sizes[AC_MODES] = { diff -r 94c3f01c243c -r 4394344397d8 vc1data.h --- a/vc1data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/vc1data.h Sat Jun 16 22:59:13 2007 +0000 @@ -28,6 +28,10 @@ #ifndef VC1DATA_H #define VC1DATA_H +#include +#include "bitstream.h" +#include "rational.h" + /** Table for conversion between TTBLK and TTMB */ extern const int ff_vc1_ttblk_to_tt[3][8]; diff -r 94c3f01c243c -r 4394344397d8 vorbis_enc_data.h --- a/vorbis_enc_data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/vorbis_enc_data.h Sat Jun 16 22:59:13 2007 +0000 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + static const uint8_t codebook0[] = { 2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 13, diff -r 94c3f01c243c -r 4394344397d8 vp3data.h --- a/vp3data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/vp3data.h Sat Jun 16 22:59:13 2007 +0000 @@ -21,6 +21,9 @@ #ifndef VP3DATA_H #define VP3DATA_H +#include +#include + /* these coefficients dequantize intraframe Y plane coefficients * (note: same as JPEG) */ static const int16_t vp31_intra_y_dequant[64] = diff -r 94c3f01c243c -r 4394344397d8 vp5data.h --- a/vp5data.h Sat Jun 16 22:58:43 2007 +0000 +++ b/vp5data.h Sat Jun 16 22:59:13 2007 +0000 @@ -24,6 +24,8 @@ #ifndef VP5DATA_H #define VP5DATA_H +#include + static const uint8_t vp5_coeff_groups[] = { -1, 0, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, diff -r 94c3f01c243c -r 4394344397d8 wmadata.h --- a/wmadata.h Sat Jun 16 22:58:43 2007 +0000 +++ b/wmadata.h Sat Jun 16 22:59:13 2007 +0000 @@ -24,6 +24,9 @@ * Various WMA tables. */ +#include +#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,