Originally committed as revision 17445 to svn://svn.ffmpeg.org/ffmpeg/trunk
Aurelien Jacobs authored on 2009/02/19 09:27:57... | ... |
@@ -991,6 +991,7 @@ dxa_decoder_select="zlib" |
991 | 991 |
eac3_decoder_deps="gpl" |
992 | 992 |
eac3_decoder_select="fft mdct" |
993 | 993 |
eatgq_decoder_select="aandct" |
994 |
+eatqi_decoder_select="aandct" |
|
994 | 995 |
ffv1_decoder_select="golomb" |
995 | 996 |
flac_decoder_select="golomb" |
996 | 997 |
flac_encoder_select="golomb" |
... | ... |
@@ -1024,6 +1025,8 @@ png_encoder_select="zlib" |
1024 | 1024 |
qdm2_decoder_select="fft mdct rdft" |
1025 | 1025 |
rv10_encoder_select="aandct" |
1026 | 1026 |
rv20_encoder_select="aandct" |
1027 |
+rv30_decoder_select="golomb" |
|
1028 |
+rv40_decoder_select="golomb" |
|
1027 | 1029 |
shorten_decoder_select="golomb" |
1028 | 1030 |
sonic_decoder_select="golomb" |
1029 | 1031 |
sonic_encoder_select="golomb" |
... | ... |
@@ -33,7 +33,7 @@ OBJS-$(CONFIG_OLDSCALER) += imgresample.o |
33 | 33 |
OBJS-$(CONFIG_RDFT) += rdft.o |
34 | 34 |
|
35 | 35 |
# decoders/encoders |
36 |
-OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o |
|
36 |
+OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o |
|
37 | 37 |
OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o |
38 | 38 |
OBJS-$(CONFIG_AC3_DECODER) += eac3dec.o ac3dec.o ac3tab.o ac3dec_data.o ac3.o |
39 | 39 |
OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o |
... | ... |
@@ -186,8 +186,8 @@ OBJS-$(CONFIG_RV10_DECODER) += rv10.o h263.o mpeg12data.o mpegvideo.o |
186 | 186 |
OBJS-$(CONFIG_RV10_ENCODER) += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
187 | 187 |
OBJS-$(CONFIG_RV20_DECODER) += rv10.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
188 | 188 |
OBJS-$(CONFIG_RV20_ENCODER) += rv10.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
189 |
-OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o h264pred.o rv30dsp.o |
|
190 |
-OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o h264pred.o rv40dsp.o |
|
189 |
+OBJS-$(CONFIG_RV30_DECODER) += rv30.o rv34.o h264pred.o rv30dsp.o mpegvideo.o error_resilience.o |
|
190 |
+OBJS-$(CONFIG_RV40_DECODER) += rv40.o rv34.o h264pred.o rv40dsp.o mpegvideo.o error_resilience.o |
|
191 | 191 |
OBJS-$(CONFIG_SGI_DECODER) += sgidec.o |
192 | 192 |
OBJS-$(CONFIG_SGI_ENCODER) += sgienc.o rle.o |
193 | 193 |
OBJS-$(CONFIG_SHORTEN_DECODER) += shorten.o |
... | ... |
@@ -204,7 +204,7 @@ OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o |
204 | 204 |
OBJS-$(CONFIG_SUNRAST_DECODER) += sunrast.o |
205 | 205 |
OBJS-$(CONFIG_SVQ1_DECODER) += svq1dec.o svq1.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
206 | 206 |
OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o motion_est.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
207 |
-OBJS-$(CONFIG_SVQ3_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o svq1dec.o |
|
207 |
+OBJS-$(CONFIG_SVQ3_DECODER) += h264.o h264idct.o h264pred.o h264_parser.o cabac.o mpegvideo.o error_resilience.o svq1dec.o svq1.o h263.o |
|
208 | 208 |
OBJS-$(CONFIG_TARGA_DECODER) += targa.o |
209 | 209 |
OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o |
210 | 210 |
OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o vp3dsp.o |
... | ... |
@@ -220,8 +220,8 @@ OBJS-$(CONFIG_TTA_DECODER) += tta.o |
220 | 220 |
OBJS-$(CONFIG_TXD_DECODER) += txd.o s3tc.o |
221 | 221 |
OBJS-$(CONFIG_ULTI_DECODER) += ulti.o |
222 | 222 |
OBJS-$(CONFIG_VB_DECODER) += vb.o |
223 |
-OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o |
|
224 |
-OBJS-$(CONFIG_VC1_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o |
|
223 |
+OBJS-$(CONFIG_VC1_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o |
|
224 |
+OBJS-$(CONFIG_VC1_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o |
|
225 | 225 |
OBJS-$(CONFIG_VCR1_DECODER) += vcr1.o |
226 | 226 |
OBJS-$(CONFIG_VCR1_ENCODER) += vcr1.o |
227 | 227 |
OBJS-$(CONFIG_VMDAUDIO_DECODER) += vmdav.o |
... | ... |
@@ -244,8 +244,8 @@ OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvide |
244 | 244 |
OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
245 | 245 |
OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o |
246 | 246 |
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o msmpeg4.o msmpeg4data.o mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o |
247 |
-OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o |
|
248 |
-OBJS-$(CONFIG_WMV3_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o |
|
247 |
+OBJS-$(CONFIG_WMV3_DECODER) += vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o |
|
248 |
+OBJS-$(CONFIG_WMV3_VDPAU_DECODER) += vdpau.o vc1.o vc1data.o vc1dsp.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o error_resilience.o mpegvideo.o msmpeg4.o |
|
249 | 249 |
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o |
250 | 250 |
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o |
251 | 251 |
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o |
... | ... |
@@ -263,6 +263,14 @@ OBJS-$(CONFIG_PCM_ALAW_DECODER) += pcm.o |
263 | 263 |
OBJS-$(CONFIG_PCM_ALAW_ENCODER) += pcm.o |
264 | 264 |
OBJS-$(CONFIG_PCM_DVD_DECODER) += pcm.o |
265 | 265 |
OBJS-$(CONFIG_PCM_DVD_ENCODER) += pcm.o |
266 |
+OBJS-$(CONFIG_PCM_F32BE_DECODER) += pcm.o |
|
267 |
+OBJS-$(CONFIG_PCM_F32BE_ENCODER) += pcm.o |
|
268 |
+OBJS-$(CONFIG_PCM_F32LE_DECODER) += pcm.o |
|
269 |
+OBJS-$(CONFIG_PCM_F32LE_ENCODER) += pcm.o |
|
270 |
+OBJS-$(CONFIG_PCM_F64BE_DECODER) += pcm.o |
|
271 |
+OBJS-$(CONFIG_PCM_F64BE_ENCODER) += pcm.o |
|
272 |
+OBJS-$(CONFIG_PCM_F64LE_DECODER) += pcm.o |
|
273 |
+OBJS-$(CONFIG_PCM_F64LE_ENCODER) += pcm.o |
|
266 | 274 |
OBJS-$(CONFIG_PCM_MULAW_DECODER) += pcm.o |
267 | 275 |
OBJS-$(CONFIG_PCM_MULAW_ENCODER) += pcm.o |
268 | 276 |
OBJS-$(CONFIG_PCM_S8_DECODER) += pcm.o |
... | ... |
@@ -316,6 +324,7 @@ OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o |
316 | 316 |
OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o |
317 | 317 |
OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o |
318 | 318 |
OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o |
319 |
+OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER) += adpcm.o |
|
319 | 320 |
OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o |
320 | 321 |
OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcm.o |
321 | 322 |
OBJS-$(CONFIG_ADPCM_IMA_SMJPEG_DECODER) += adpcm.o |
... | ... |
@@ -335,12 +344,15 @@ OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER) += adpcm.o |
335 | 335 |
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += adpcm.o |
336 | 336 |
|
337 | 337 |
# libavformat dependencies |
338 |
+OBJS-$(CONFIG_EAC3_DEMUXER) += ac3_parser.o ac3tab.o aac_ac3_parser.o |
|
338 | 339 |
OBJS-$(CONFIG_GXF_DEMUXER) += mpeg12data.o |
339 | 340 |
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += xiph.o mpeg4audio.o |
340 | 341 |
OBJS-$(CONFIG_MATROSKA_DEMUXER) += mpeg4audio.o |
341 | 342 |
OBJS-$(CONFIG_MATROSKA_MUXER) += xiph.o mpeg4audio.o |
342 | 343 |
OBJS-$(CONFIG_MOV_DEMUXER) += mpeg4audio.o mpegaudiodata.o |
344 |
+OBJS-$(CONFIG_MPEGTS_MUXER) += mpegvideo.o |
|
343 | 345 |
OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o |
346 |
+OBJS-$(CONFIG_OGG_DEMUXER) += flacdec.o |
|
344 | 347 |
OBJS-$(CONFIG_OGG_MUXER) += xiph.o |
345 | 348 |
OBJS-$(CONFIG_RTP_MUXER) += mpegvideo.o |
346 | 349 |
|
... | ... |
@@ -41,18 +41,18 @@ OBJS-$(CONFIG_DIRAC_MUXER) += raw.o |
41 | 41 |
OBJS-$(CONFIG_DNXHD_DEMUXER) += raw.o |
42 | 42 |
OBJS-$(CONFIG_DNXHD_MUXER) += raw.o |
43 | 43 |
OBJS-$(CONFIG_DSICIN_DEMUXER) += dsicin.o |
44 |
-OBJS-$(CONFIG_DTS_DEMUXER) += raw.o |
|
44 |
+OBJS-$(CONFIG_DTS_DEMUXER) += raw.o id3v2.o |
|
45 | 45 |
OBJS-$(CONFIG_DTS_MUXER) += raw.o |
46 | 46 |
OBJS-$(CONFIG_DV_DEMUXER) += dv.o |
47 | 47 |
OBJS-$(CONFIG_DV_MUXER) += dvenc.o |
48 | 48 |
OBJS-$(CONFIG_DXA_DEMUXER) += dxa.o riff.o |
49 | 49 |
OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o |
50 | 50 |
OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o |
51 |
-OBJS-$(CONFIG_EAC3_DEMUXER) += raw.o |
|
51 |
+OBJS-$(CONFIG_EAC3_DEMUXER) += raw.o id3v2.o |
|
52 | 52 |
OBJS-$(CONFIG_EAC3_MUXER) += raw.o |
53 | 53 |
OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o |
54 | 54 |
OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o |
55 |
-OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o |
|
55 |
+OBJS-$(CONFIG_FLAC_DEMUXER) += raw.o id3v2.o |
|
56 | 56 |
OBJS-$(CONFIG_FLAC_MUXER) += raw.o |
57 | 57 |
OBJS-$(CONFIG_FLIC_DEMUXER) += flic.o |
58 | 58 |
OBJS-$(CONFIG_FLV_DEMUXER) += flvdec.o |
... | ... |
@@ -60,7 +60,7 @@ OBJS-$(CONFIG_FLV_MUXER) += flvenc.o avc.o |
60 | 60 |
OBJS-$(CONFIG_FOURXM_DEMUXER) += 4xm.o |
61 | 61 |
OBJS-$(CONFIG_FRAMECRC_MUXER) += framecrcenc.o |
62 | 62 |
OBJS-$(CONFIG_GIF_MUXER) += gif.o |
63 |
-OBJS-$(CONFIG_GSM_DEMUXER) += raw.o |
|
63 |
+OBJS-$(CONFIG_GSM_DEMUXER) += raw.o id3v2.o |
|
64 | 64 |
OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o |
65 | 65 |
OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o |
66 | 66 |
OBJS-$(CONFIG_H261_DEMUXER) += raw.o |
... | ... |
@@ -87,7 +87,7 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o riff.o isom |
87 | 87 |
OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o riff.o isom.o avc.o |
88 | 88 |
OBJS-$(CONFIG_MJPEG_DEMUXER) += raw.o |
89 | 89 |
OBJS-$(CONFIG_MJPEG_MUXER) += raw.o |
90 |
-OBJS-$(CONFIG_MLP_DEMUXER) += raw.o |
|
90 |
+OBJS-$(CONFIG_MLP_DEMUXER) += raw.o id3v2.o |
|
91 | 91 |
OBJS-$(CONFIG_MM_DEMUXER) += mm.o |
92 | 92 |
OBJS-$(CONFIG_MMF_DEMUXER) += mmf.o raw.o |
93 | 93 |
OBJS-$(CONFIG_MMF_MUXER) += mmf.o riff.o |
... | ... |
@@ -117,6 +117,7 @@ OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o |
117 | 117 |
OBJS-$(CONFIG_MVI_DEMUXER) += mvi.o |
118 | 118 |
OBJS-$(CONFIG_MXF_DEMUXER) += mxfdec.o mxf.o |
119 | 119 |
OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o |
120 |
+OBJS-$(CONFIG_MXF_D10_MUXER) += mxfenc.o mxf.o audiointerleave.o |
|
120 | 121 |
OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o |
121 | 122 |
OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o |
122 | 123 |
OBJS-$(CONFIG_NULL_MUXER) += raw.o |
... | ... |
@@ -134,18 +135,42 @@ OBJS-$(CONFIG_OGG_MUXER) += oggenc.o |
134 | 134 |
OBJS-$(CONFIG_OMA_DEMUXER) += oma.o raw.o |
135 | 135 |
OBJS-$(CONFIG_PCM_ALAW_DEMUXER) += raw.o |
136 | 136 |
OBJS-$(CONFIG_PCM_ALAW_MUXER) += raw.o |
137 |
+OBJS-$(CONFIG_PCM_F32BE_DEMUXER) += raw.o |
|
138 |
+OBJS-$(CONFIG_PCM_F32BE_MUXER) += raw.o |
|
139 |
+OBJS-$(CONFIG_PCM_F32LE_DEMUXER) += raw.o |
|
140 |
+OBJS-$(CONFIG_PCM_F32LE_MUXER) += raw.o |
|
141 |
+OBJS-$(CONFIG_PCM_F64BE_DEMUXER) += raw.o |
|
142 |
+OBJS-$(CONFIG_PCM_F64BE_MUXER) += raw.o |
|
143 |
+OBJS-$(CONFIG_PCM_F64LE_DEMUXER) += raw.o |
|
144 |
+OBJS-$(CONFIG_PCM_F64LE_MUXER) += raw.o |
|
137 | 145 |
OBJS-$(CONFIG_PCM_MULAW_DEMUXER) += raw.o |
138 | 146 |
OBJS-$(CONFIG_PCM_MULAW_MUXER) += raw.o |
139 | 147 |
OBJS-$(CONFIG_PCM_S16BE_DEMUXER) += raw.o |
140 | 148 |
OBJS-$(CONFIG_PCM_S16BE_MUXER) += raw.o |
141 | 149 |
OBJS-$(CONFIG_PCM_S16LE_DEMUXER) += raw.o |
142 | 150 |
OBJS-$(CONFIG_PCM_S16LE_MUXER) += raw.o |
151 |
+OBJS-$(CONFIG_PCM_S24BE_DEMUXER) += raw.o |
|
152 |
+OBJS-$(CONFIG_PCM_S24BE_MUXER) += raw.o |
|
153 |
+OBJS-$(CONFIG_PCM_S24LE_DEMUXER) += raw.o |
|
154 |
+OBJS-$(CONFIG_PCM_S24LE_MUXER) += raw.o |
|
155 |
+OBJS-$(CONFIG_PCM_S32BE_DEMUXER) += raw.o |
|
156 |
+OBJS-$(CONFIG_PCM_S32BE_MUXER) += raw.o |
|
157 |
+OBJS-$(CONFIG_PCM_S32LE_DEMUXER) += raw.o |
|
158 |
+OBJS-$(CONFIG_PCM_S32LE_MUXER) += raw.o |
|
143 | 159 |
OBJS-$(CONFIG_PCM_S8_DEMUXER) += raw.o |
144 | 160 |
OBJS-$(CONFIG_PCM_S8_MUXER) += raw.o |
145 | 161 |
OBJS-$(CONFIG_PCM_U16BE_DEMUXER) += raw.o |
146 | 162 |
OBJS-$(CONFIG_PCM_U16BE_MUXER) += raw.o |
147 | 163 |
OBJS-$(CONFIG_PCM_U16LE_DEMUXER) += raw.o |
148 | 164 |
OBJS-$(CONFIG_PCM_U16LE_MUXER) += raw.o |
165 |
+OBJS-$(CONFIG_PCM_U24BE_DEMUXER) += raw.o |
|
166 |
+OBJS-$(CONFIG_PCM_U24BE_MUXER) += raw.o |
|
167 |
+OBJS-$(CONFIG_PCM_U24LE_DEMUXER) += raw.o |
|
168 |
+OBJS-$(CONFIG_PCM_U24LE_MUXER) += raw.o |
|
169 |
+OBJS-$(CONFIG_PCM_U32BE_DEMUXER) += raw.o |
|
170 |
+OBJS-$(CONFIG_PCM_U32BE_MUXER) += raw.o |
|
171 |
+OBJS-$(CONFIG_PCM_U32LE_DEMUXER) += raw.o |
|
172 |
+OBJS-$(CONFIG_PCM_U32LE_MUXER) += raw.o |
|
149 | 173 |
OBJS-$(CONFIG_PCM_U8_DEMUXER) += raw.o |
150 | 174 |
OBJS-$(CONFIG_PCM_U8_MUXER) += raw.o |
151 | 175 |
OBJS-$(CONFIG_PSP_MUXER) += movenc.o riff.o isom.o avc.o |
... | ... |
@@ -169,7 +194,7 @@ OBJS-$(CONFIG_RTP_MUXER) += rtp.o \ |
169 | 169 |
OBJS-$(CONFIG_RTSP_DEMUXER) += rdt.o rtsp.o |
170 | 170 |
OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o rtp.o rtpdec.o rtp_h264.o |
171 | 171 |
OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o |
172 |
-OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o |
|
172 |
+OBJS-$(CONFIG_SHORTEN_DEMUXER) += raw.o id3v2.o |
|
173 | 173 |
OBJS-$(CONFIG_SIFF_DEMUXER) += siff.o |
174 | 174 |
OBJS-$(CONFIG_SMACKER_DEMUXER) += smacker.o |
175 | 175 |
OBJS-$(CONFIG_SOL_DEMUXER) += sol.o raw.o |