Revision 17179d2d

View differences:

libavcodec/avcodec.h
17 17

  
18 18
#define FFMPEG_VERSION_INT     0x000409
19 19
#define FFMPEG_VERSION         "0.4.9-pre1"
20
#define LIBAVCODEC_BUILD       4732
20
#define LIBAVCODEC_BUILD       4733
21 21

  
22 22
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
23 23
#define LIBAVCODEC_VERSION     FFMPEG_VERSION
......
38 38
    CODEC_ID_H263,
39 39
    CODEC_ID_RV10,
40 40
    CODEC_ID_RV20,
41
    CODEC_ID_MP2,
42
    CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
43
    CODEC_ID_VORBIS,
44
    CODEC_ID_AC3,
45 41
    CODEC_ID_MJPEG,
46 42
    CODEC_ID_MJPEGB,
47 43
    CODEC_ID_LJPEG,
......
59 55
    CODEC_ID_SVQ1,
60 56
    CODEC_ID_SVQ3,
61 57
    CODEC_ID_DVVIDEO,
62
    CODEC_ID_DVAUDIO,
63
    CODEC_ID_WMAV1,
64
    CODEC_ID_WMAV2,
65
    CODEC_ID_MACE3,
66
    CODEC_ID_MACE6,
67 58
    CODEC_ID_HUFFYUV,
68 59
    CODEC_ID_CYUV,
69 60
    CODEC_ID_H264,
70 61
    CODEC_ID_INDEO3,
71 62
    CODEC_ID_VP3,
72 63
    CODEC_ID_THEORA,
73
    CODEC_ID_AAC,
74
    CODEC_ID_MPEG4AAC,
75 64
    CODEC_ID_ASV1,
76 65
    CODEC_ID_ASV2,
77 66
    CODEC_ID_FFV1,
......
94 83
    CODEC_ID_FLIC,
95 84
    CODEC_ID_TRUEMOTION1,
96 85
    CODEC_ID_VMDVIDEO,
97
    CODEC_ID_VMDAUDIO,
98 86
    CODEC_ID_MSZH,
99 87
    CODEC_ID_ZLIB,
100
    CODEC_ID_SONIC,
101
    CODEC_ID_SONIC_LS,
102 88
    CODEC_ID_QTRLE,
103 89
    CODEC_ID_SNOW,
104 90
    CODEC_ID_TSCC,
......
106 92
    CODEC_ID_QDRAW,
107 93
    CODEC_ID_VIXL,
108 94
    CODEC_ID_QPEG,
95
    CODEC_ID_XVID,
96
    CODEC_ID_PNG,
97
    CODEC_ID_PPM,
98
    CODEC_ID_PBM,
99
    CODEC_ID_PGM,
100
    CODEC_ID_PGMYUV,
101
    CODEC_ID_PAM,
109 102

  
110 103
    /* various pcm "codecs" */
111
    CODEC_ID_PCM_S16LE,
104
    CODEC_ID_PCM_S16LE= 0x10000,
112 105
    CODEC_ID_PCM_S16BE,
113 106
    CODEC_ID_PCM_U16LE,
114 107
    CODEC_ID_PCM_U16BE,
......
118 111
    CODEC_ID_PCM_ALAW,
119 112

  
120 113
    /* various adpcm codecs */
121
    CODEC_ID_ADPCM_IMA_QT,
114
    CODEC_ID_ADPCM_IMA_QT= 0x11000,
122 115
    CODEC_ID_ADPCM_IMA_WAV,
123 116
    CODEC_ID_ADPCM_IMA_DK3,
124 117
    CODEC_ID_ADPCM_IMA_DK4,
......
132 125
    CODEC_ID_ADPCM_G726,
133 126
    CODEC_ID_ADPCM_CT,
134 127

  
135
	/* AMR */
136
    CODEC_ID_AMR_NB,
128
    /* AMR */
129
    CODEC_ID_AMR_NB= 0x12000,
137 130
    CODEC_ID_AMR_WB,
138 131

  
139 132
    /* RealAudio codecs*/
140
    CODEC_ID_RA_144,
133
    CODEC_ID_RA_144= 0x13000,
141 134
    CODEC_ID_RA_288,
142 135

  
143 136
    /* various DPCM codecs */
144
    CODEC_ID_ROQ_DPCM,
137
    CODEC_ID_ROQ_DPCM= 0x14000,
145 138
    CODEC_ID_INTERPLAY_DPCM,
146 139
    CODEC_ID_XAN_DPCM,
147 140
    CODEC_ID_SOL_DPCM,
148 141
    
142
    CODEC_ID_MP2= 0x15000,
143
    CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
144
    CODEC_ID_AAC,
145
    CODEC_ID_MPEG4AAC,
146
    CODEC_ID_AC3,
147
    CODEC_ID_DTS,
148
    CODEC_ID_VORBIS,
149
    CODEC_ID_DVAUDIO,
150
    CODEC_ID_WMAV1,
151
    CODEC_ID_WMAV2,
152
    CODEC_ID_MACE3,
153
    CODEC_ID_MACE6,
154
    CODEC_ID_VMDAUDIO,
155
    CODEC_ID_SONIC,
156
    CODEC_ID_SONIC_LS,
149 157
    CODEC_ID_FLAC,
150 158
    
151
    CODEC_ID_MPEG2TS, /* _FAKE_ codec to indicate a raw MPEG2 transport
159
    CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport
152 160
                         stream (only used by libavformat) */
153

  
154
    CODEC_ID_DTS,
155
    CODEC_ID_XVID,
156

  
157
    CODEC_ID_PNG,    
158
    CODEC_ID_PPM,
159
    CODEC_ID_PBM,
160
    CODEC_ID_PGM,
161
    CODEC_ID_PGMYUV,
162
    CODEC_ID_PAM,
163 161
};
164 162

  
165 163
/* CODEC_ID_MP3LAME is absolete */
tests/libav.regression.ref
13 13
57a8dfc7926802bb337a9d8918de94a8 *./data/b-libav.swf
14 14
41816 ./data/b-libav.swf
15 15
./data/b-libav.swf CRC=2b273fea
16
b57e3c4e0f27cbd0bf7b7fafb142fe7f *./data/b-libav.ffm
16
2b06388316770915293edcbcc693beef *./data/b-libav.ffm
17 17
389120 ./data/b-libav.ffm
18 18
./data/b-libav.ffm CRC=f765cbdd
19 19
794934a02582f8dfc85d1856514cf37c *./data/b-libav.flv

Also available in: Unified diff