include all prerequisites in header files

Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård committed 19 years ago

Commit 99545451 parent c2d08dc72 files · +180 −0Browse files

Showing the changes to libavcodec (48 of 72 files). Show all

Unified · Split

48 files

libavcodec/aac_ac3_parser.h +3 −0
libavcodec/atrac3data.h +2 −0
libavcodec/bitstream.h +5 −0
libavcodec/bmp.h +2 −0
libavcodec/bytestream.h +2 −0
libavcodec/cookdata.h +2 −0
libavcodec/dcadata.h +2 −0
libavcodec/dcahuff.h +3 −0
libavcodec/dnxhddata.h +2 −0
libavcodec/dvdata.h +3 −0
libavcodec/faandct.h +2 −0
libavcodec/golomb.h +3 −0
libavcodec/h261data.h +3 −0
libavcodec/h263_parser.h +2 −0
libavcodec/h263data.h +2 −0
libavcodec/h264data.h +4 −0
libavcodec/imcdata.h +2 −0
libavcodec/indeo2data.h +2 −0
libavcodec/indeo3data.h +2 −0
libavcodec/jpeglsdec.h +1 −0
libavcodec/mathops.h +2 −0
libavcodec/mpcdata.h +2 −0
libavcodec/mpeg12data.h +3 −0
libavcodec/mpeg4data.h +3 −0
libavcodec/mpegaudiodectab.h +3 −0
libavcodec/mpegaudiotab.h +3 −0
libavcodec/msmpeg4tab.h +4 −0
libavcodec/opt.h +2 −0
libavcodec/qdm2data.h +2 −0
libavcodec/rangecoder.h +4 −0
libavcodec/ratecontrol.h +2 −0
libavcodec/rl.h +4 −0
libavcodec/rle.h +2 −0
libavcodec/rtjpeg.h +3 −0
libavcodec/s3tc.h +2 −0
libavcodec/simple_idct.h +3 −0
libavcodec/sp5x.h +2 −0
libavcodec/svq1_cb.h +3 −0
libavcodec/svq1_vlc.h +2 −0
libavcodec/tiff.h +2 −0
libavcodec/truemotion1data.h +3 −0
libavcodec/truespeech_data.h +2 −0
libavcodec/vc1acdata.h +2 −0
libavcodec/vc1data.h +4 −0
libavcodec/vorbis_enc_data.h +2 −0
libavcodec/vp3data.h +3 −0
libavcodec/vp5data.h +2 −0
libavcodec/wmadata.h +3 −0

@@ -23,6 +23,9 @@ · 22 unmodified lines
23	23	#ifndef AAC_AC3_PARSER_H
24	24	#define AAC_AC3_PARSER_H
25	25
	26	+#include <stdint.h>
	27	+#include "avcodec.h"
	28	+
26	29	typedef struct AACAC3ParseContext {
27	30	uint8_t *inbuf_ptr;
28	31	int frame_size;

libavcodec/atrac3data.h+2−0

@@ -25,6 +25,8 @@ · 24 unmodified lines
25	25	* Atrac 3 AKA RealAudio 8 compatible decoder data
26	26	*/
27	27
	28	+#include <stdint.h>
	29	+
28	30	/* VLC tables */
29	31
30	32	static const uint8_t huffcode1[9] = {

libavcodec/bitstream.h+5−0

@@ -26,6 +26,11 @@ · 25 unmodified lines
26	26	#ifndef BITSTREAM_H
27	27	#define BITSTREAM_H
28	28
	29	+#include <stdint.h>
	30	+#include <stdlib.h>
	31	+#include <assert.h>
	32	+#include "common.h"
	33	+#include "bswap.h"
29	34	#include "log.h"
30	35
31	36	#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER)

libavcodec/bmp.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include "avcodec.h"
	23	+
22	24	typedef struct BMPContext {
23	25	AVFrame picture;
24	26	} BMPContext;

libavcodec/bytestream.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	#ifndef FFMPEG_BYTESTREAM_H
23	23	#define FFMPEG_BYTESTREAM_H
24	24
	25	+#include "common.h"
	26	+
25	27	#define DEF(name, bytes, read, write)\
26	28	static av_always_inline unsigned int bytestream_get_ ## name(uint8_t **b){\
27	29	(*b) += bytes;\

libavcodec/cookdata.h+2−0

@@ -26,6 +26,8 @@ · 25 unmodified lines
26	26	* Cook AKA RealAudio G2 compatible decoderdata
27	27	*/
28	28
	29	+#include <stdint.h>
	30	+
29	31	/* various data tables */
30	32
31	33	static const int expbits_tab[8] = {

libavcodec/dcadata.h+2−0

@@ -24,6 +24,8 @@ · 23 unmodified lines
24	24	* @file dcadata.c
25	25	*/
26	26
	27	+#include <stdint.h>
	28	+
27	29	/* Generic tables */
28	30
29	31	static const uint32_t dca_sample_rates[16] =

libavcodec/dcahuff.h+3−0

@@ -20,6 +20,9 @@ · 19 unmodified lines
20	20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	21	*/
22	22
	23	+#include <stdint.h>
	24	+#include <stdlib.h>
	25	+
23	26	#define TMODE_COUNT 4
24	27	static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 };
25	28	static const uint16_t tmode_codes[TMODE_COUNT][4] = {

libavcodec/dnxhddata.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include <stdint.h>
	23	+
22	24	static const uint8_t dnxhd_1238_luma_weigth[] = {
23	25	0, 32, 32, 33, 34, 33, 33, 33,
24	26	33, 33, 33, 33, 33, 35, 37, 37,

libavcodec/dvdata.h+3−0

@@ -24,6 +24,9 @@ · 23 unmodified lines
24	24	* Constants for DV codec.
25	25	*/
26	26
	27	+#include "avcodec.h"
	28	+#include "rational.h"
	29	+
27	30	/*
28	31	* DVprofile is used to express the differences between various
29	32	* DV flavors. For now it's primarily used for differentiating

libavcodec/faandct.h+2−0

@@ -27,6 +27,8 @@ · 26 unmodified lines
27	27	* @author Michael Niedermayer <michaelni@gmx.at>
28	28	*/
29	29
	30	+#include "dsputil.h"
	31	+
30	32	#define FAAN_POSTSCALE
31	33
32	34	void ff_faandct(DCTELEM * data);

libavcodec/golomb.h+3−0

@@ -28,6 +28,9 @@ · 27 unmodified lines
28	28	* @author Michael Niedermayer <michaelni@gmx.at> and Alex Beregszaszi
29	29	*/
30	30
	31	+#include <stdint.h>
	32	+#include "bitstream.h"
	33	+
31	34	#define INVALID_VLC 0x80000000
32	35
33	36	extern const uint8_t ff_golomb_vlc_len[512];

libavcodec/h261data.h+3−0

@@ -24,6 +24,9 @@ · 23 unmodified lines
24	24	* H.261 tables.
25	25	*/
26	26
	27	+#include <stdint.h>
	28	+#include "h261.h"
	29	+
27	30	// H.261 VLC table for macroblock addressing
28	31	static const uint8_t h261_mba_code[35] = {
29	32	1, 3, 2, 3,

libavcodec/h263_parser.h+2−0

@@ -19,4 +19,6 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include "parser.h"
	23	+
22	24	int ff_h263_find_frame_end(ParseContext pc, const uint8_t buf, int buf_size);

libavcodec/h263data.h+2−0

@@ -26,6 +26,8 @@ · 25 unmodified lines
26	26	* H.263 tables.
27	27	*/
28	28
	29	+#include <stdint.h>
	30	+#include "mpegvideo.h"
29	31
30	32	/* intra MCBPC, mb_type = (intra), then (intraq) */
31	33	const uint8_t intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 };

libavcodec/h264data.h+4−0

@@ -27,6 +27,10 @@ · 26 unmodified lines
27	27	* @author Michael Niedermayer <michaelni@gmx.at>
28	28	*/
29	29
	30	+#include <stdint.h>
	31	+#include "mpegvideo.h"
	32	+#include "rational.h"
	33	+
30	34	#define VERT_PRED 0
31	35	#define HOR_PRED 1
32	36	#define DC_PRED 2

libavcodec/imcdata.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	*
23	23	*/
24	24
	25	+#include <stdint.h>
	26	+
25	27	static const uint16_t band_tab[33] = {
26	28	0, 3, 6, 9, 12, 16, 20, 24, 29, 34, 40,
27	29	46, 53, 60, 68, 76, 84, 93, 102, 111, 121, 131,

libavcodec/indeo2data.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include <stdint.h>
	23	+
22	24	#define IR2_CODES 143
23	25	static const uint16_t ir2_codes[IR2_CODES][2] = {
24	26	#ifdef ALT_BITSTREAM_READER_LE

libavcodec/indeo3data.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include <stdint.h>
	23	+
22	24	static const uint32_t correction[] = {
23	25	0x00000000, 0x00000202, 0xfffffdfe, 0x000002ff, 0xfffffd01, 0xffffff03, 0x000000fd, 0x00000404,
24	26	0xfffffbfc, 0x00000501, 0xfffffaff, 0x00000105, 0xfffffefb, 0x000003fc, 0xfffffc04, 0x000005fe,

libavcodec/jpeglsdec.h+1−0

@@ -29,6 +29,7 @@ · 28 unmodified lines
29	29	#define JPEGLSDEC_H
30	30
31	31	#include "mjpeg.h"
	32	+#include "mjpegdec.h"
32	33
33	34	/**
34	35	* Decode LSE block with initialization parameters

libavcodec/mathops.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	#ifndef MATHOPS_H
23	23	#define MATHOPS_H
24	24
	25	+#include "common.h"
	26	+
25	27	#ifdef ARCH_X86_32
26	28
27	29	#include "i386/mathops.h"

libavcodec/mpcdata.h+2−0

@@ -20,6 +20,8 @@ · 19 unmodified lines
20	20	*
21	21	*/
22	22
	23	+#include <stdint.h>
	24	+
23	25	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};
24	26	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};
25	27	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};

libavcodec/mpeg12data.h+3−0

@@ -25,6 +25,9 @@ · 24 unmodified lines
25	25	* MPEG1/2 tables.
26	26	*/
27	27
	28	+#include <stdint.h>
	29	+#include "mpegvideo.h"
	30	+
28	31	const uint16_t ff_mpeg1_default_intra_matrix[64] = {
29	32	8, 16, 19, 22, 26, 27, 29, 34,
30	33	16, 16, 22, 24, 27, 29, 34, 37,

libavcodec/mpeg4data.h+3−0

@@ -25,6 +25,9 @@ · 24 unmodified lines
25	25	* mpeg4 tables.
26	26	*/
27	27
	28	+#include <stdint.h>
	29	+#include "mpegvideo.h"
	30	+
28	31	// shapes
29	32	#define RECT_SHAPE 0
30	33	#define BIN_SHAPE 1

libavcodec/mpegaudiodectab.h+3−0

@@ -24,6 +24,9 @@ · 23 unmodified lines
24	24	* mpeg audio layer decoder tables.
25	25	*/
26	26
	27	+#include <stdint.h>
	28	+#include "mpegaudio.h"
	29	+
27	30	/*******************************************************/
28	31	/* layer 3 tables */
29	32

libavcodec/mpegaudiotab.h+3−0

@@ -27,6 +27,9 @@ · 26 unmodified lines
27	27	* Most of them come from the mpeg audio specification.
28	28	*/
29	29
	30	+#include <stdint.h>
	31	+#include "mpegaudio.h"
	32	+
30	33	#define SQRT2 1.41421356237309514547
31	34
32	35	static const int costab32[30] = {

libavcodec/msmpeg4tab.h+4−0

@@ -27,6 +27,10 @@ · 26 unmodified lines
27	27	* MSMPEG4 data tables.
28	28	*/
29	29
	30	+#include <stdint.h>
	31	+#include "bitstream.h"
	32	+#include "rl.h"
	33	+
30	34	/* non intra picture macro block coded block pattern + mb type */
31	35	static const uint32_t table_mb_non_intra[128][2] = {
32	36	{ 0x40, 7 },{ 0x13c9, 13 },{ 0x9fd, 12 },{ 0x1fc, 15 },

libavcodec/opt.h+2−0

@@ -27,6 +27,8 @@ · 26 unmodified lines
27	27	* AVOptions
28	28	*/
29	29
	30	+#include "rational.h"
	31	+
30	32	enum AVOptionType{
31	33	FF_OPT_TYPE_FLAGS,
32	34	FF_OPT_TYPE_INT,

libavcodec/qdm2data.h+2−0

@@ -31,6 +31,8 @@ · 30 unmodified lines
31	31	#ifndef QDM2DATA_H
32	32	#define QDM2DATA_H
33	33
	34	+#include <stdint.h>
	35	+
34	36	/ VLC TABLES /
35	37
36	38	/* values in this table range from -1..23; adjust retrieved value by -1 */

libavcodec/rangecoder.h+4−0

@@ -25,6 +25,10 @@ · 24 unmodified lines
25	25	* Range coder.
26	26	*/
27	27
	28	+#include <stdint.h>
	29	+#include <assert.h>
	30	+#include "common.h"
	31	+
28	32	typedef struct RangeCoder{
29	33	int low;
30	34	int range;

libavcodec/ratecontrol.h+2−0

@@ -28,6 +28,8 @@ · 27 unmodified lines
28	28	* ratecontrol header.
29	29	*/
30	30
	31	+#include <stdio.h>
	32	+#include <stdint.h>
31	33	#include "eval.h"
32	34
33	35	typedef struct Predictor{

libavcodec/rl.h+4−0

@@ -6,6 +6,10 @@ · 5 unmodified lines
6	6	#ifndef AVCODEC_RL_H
7	7	#define AVCODEC_RL_H
8	8
	9	+#include <stdint.h>
	10	+#include "bitstream.h"
	11	+#include "mpegvideo.h"
	12	+
9	13	/** RLTable. */
10	14	typedef struct RLTable {
11	15	int n; ///< number of entries of table_vlc minus 1

libavcodec/rle.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	#ifndef RLE_H
23	23	#define RLE_H
24	24
	25	+#include <stdint.h>
	26	+
25	27	/**
26	28	* RLE compress the row, with maximum size of out_size. Value before repeated bytes is (count ^ xor_rep) + add_rep.
27	29	* Value before raw bytes is (count ^ xor_raw) + add_raw.

libavcodec/rtjpeg.h+3−0

@@ -22,6 +22,9 @@ · 21 unmodified lines
22	22	#ifndef RTJPEG_H
23	23	#define RTJPEG_H
24	24
	25	+#include <stdint.h>
	26	+#include <dsputil.h>
	27	+
25	28	typedef struct {
26	29	int w, h;
27	30	DSPContext *dsp;

libavcodec/s3tc.h+2−0

@@ -23,6 +23,8 @@ · 22 unmodified lines
23	23	#ifndef FF_S3TC_H
24	24	#define FF_S3TC_H
25	25
	26	+#include <stdint.h>
	27	+
26	28	#define FF_S3TC_DXT1 0x31545844
27	29	#define FF_S3TC_DXT3 0x33545844
28	30

libavcodec/simple_idct.h+3−0

@@ -25,6 +25,9 @@ · 24 unmodified lines
25	25	* simple idct header.
26	26	*/
27	27
	28	+#include <stdint.h>
	29	+#include "dsputil.h"
	30	+
28	31	void simple_idct_put(uint8_t dest, int line_size, DCTELEM block);
29	32	void simple_idct_add(uint8_t dest, int line_size, DCTELEM block);
30	33	void ff_simple_idct_mmx(int16_t *block);

libavcodec/sp5x.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	#ifndef SP5X_H
23	23	#define SP5X_H
24	24
	25	+#include <stdint.h>
	26	+
25	27	static const uint8_t sp5x_data_sof[] =
26	28	{
27	29	0xFF, 0xC0, /* SOF */

libavcodec/svq1_cb.h+3−0

@@ -29,6 +29,9 @@ · 28 unmodified lines
29	29	* svq1 code books.
30	30	*/
31	31
	32	+#include <stdint.h>
	33	+#include <stdlib.h>
	34	+
32	35	/* 6x16-entry codebook for inter-coded 4x2 vectors */
33	36	static const int8_t svq1_inter_codebook_4x2[768] = {
34	37	7, 2, -6, -7, 7, 3, -3, -4, -7, -2, 7, 8, -8, -4, 3, 4,

libavcodec/svq1_vlc.h+2−0

@@ -21,6 +21,8 @@ · 20 unmodified lines
21	21	#ifndef SVQ1_VLC_H
22	22	#define SVQ1_VLC_H
23	23
	24	+#include <stdint.h>
	25	+
24	26	/* values in this table range from 0..3; adjust retrieved value by +0 */
25	27	static const uint8_t svq1_block_type_vlc[4][2] = {
26	28	/* { code, length } */

libavcodec/tiff.h+2−0

@@ -28,6 +28,8 @@ · 27 unmodified lines
28	28	#ifndef TIFF_H
29	29	#define TIFF_H
30	30
	31	+#include <stdint.h>
	32	+
31	33	/** abridged list of TIFF tags */
32	34	enum TiffTags{
33	35	TIFF_SUBFILE = 0xfe,

libavcodec/truemotion1data.h+3−0

@@ -25,6 +25,9 @@ · 24 unmodified lines
25	25	#ifndef TRUEMOTION1DATA_H
26	26	#define TRUEMOTION1DATA_H
27	27
	28	+#include <stdint.h>
	29	+#include <stdlib.h>
	30	+
28	31	/* Y delta tables, skinny and fat */
29	32	static const int16_t ydt1[8] = { 0, -2, 2, -6, 6, -12, 12, -12 };
30	33	static const int16_t ydt2[8] = { 0, -2, 4, -6, 8, -12, 12, -12 };

libavcodec/truespeech_data.h+2−0

@@ -22,6 +22,8 @@ · 21 unmodified lines
22	22	#ifndef __TRUESPEECH_DATA__
23	23	#define __TRUESPEECH_DATA__
24	24
	25	+#include <stdint.h>
	26	+
25	27	/* codebooks fo expanding input filter */
26	28	static const int16_t ts_cb_0[32] = {
27	29	0x8240, 0x8364, 0x84CE, 0x865D, 0x8805, 0x89DE, 0x8BD7, 0x8DF4,

libavcodec/vc1acdata.h+2−0

@@ -19,6 +19,8 @@ · 18 unmodified lines
19	19	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	20	*/
21	21
	22	+#include <stdint.h>
	23	+
22	24	#define AC_MODES 8
23	25
24	26	static const int vc1_ac_sizes[AC_MODES] = {

libavcodec/vc1data.h+4−0

@@ -28,6 +28,10 @@ · 27 unmodified lines
28	28	#ifndef VC1DATA_H
29	29	#define VC1DATA_H
30	30
	31	+#include <stdint.h>
	32	+#include "bitstream.h"
	33	+#include "rational.h"
	34	+
31	35	/** Table for conversion between TTBLK and TTMB */
32	36	extern const int ff_vc1_ttblk_to_tt[3][8];
33	37

libavcodec/vorbis_enc_data.h+2−0

@@ -18,6 +18,8 @@ · 17 unmodified lines
18	18	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19	19	*/
20	20
	21	+#include <stdint.h>
	22	+
21	23	static const uint8_t codebook0[] = {
22	24	2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7,
23	25	13,

libavcodec/vp3data.h+3−0

@@ -21,6 +21,9 @@ · 20 unmodified lines
21	21	#ifndef VP3DATA_H
22	22	#define VP3DATA_H
23	23
	24	+#include <stdint.h>
	25	+#include <stdlib.h>
	26	+
24	27	/* these coefficients dequantize intraframe Y plane coefficients
25	28	* (note: same as JPEG) */
26	29	static const int16_t vp31_intra_y_dequant[64] =

libavcodec/vp5data.h+2−0

@@ -24,6 +24,8 @@ · 23 unmodified lines
24	24	#ifndef VP5DATA_H
25	25	#define VP5DATA_H
26	26
	27	+#include <stdint.h>
	28	+
27	29	static const uint8_t vp5_coeff_groups[] = {
28	30	-1, 0, 1, 1, 2, 1, 1, 2,
29	31	2, 1, 1, 2, 2, 2, 1, 2,

libavcodec/wmadata.h+3−0

@@ -24,6 +24,9 @@ · 23 unmodified lines
24	24	* Various WMA tables.
25	25	*/
26	26
	27	+#include <stdint.h>
	28	+#include "wma.h"
	29	+
27	30	static const uint16_t wma_critical_freqs[25] = {
28	31	100, 200, 300, 400, 510, 630, 770, 920,
29	32	1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150,

include all prerequisites in header files

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code