Originally committed as revision 19491 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2009/07/23 06:36:50... | ... |
@@ -1112,6 +1112,7 @@ sonic_encoder_select="golomb" |
1112 | 1112 |
sonic_ls_encoder_select="golomb" |
1113 | 1113 |
svq3_decoder_select="golomb" |
1114 | 1114 |
svq3_decoder_suggest="zlib" |
1115 |
+theora_decoder_select="vp3_decoder" |
|
1115 | 1116 |
tiff_decoder_suggest="zlib" |
1116 | 1117 |
tiff_encoder_suggest="zlib" |
1117 | 1118 |
tscc_decoder_select="zlib" |
... | ... |
@@ -217,7 +217,7 @@ OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o motion_est.o h263.o m |
217 | 217 |
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 |
218 | 218 |
OBJS-$(CONFIG_TARGA_DECODER) += targa.o |
219 | 219 |
OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o |
220 |
-OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o vp3dsp.o |
|
220 |
+OBJS-$(CONFIG_THEORA_DECODER) += xiph.o |
|
221 | 221 |
OBJS-$(CONFIG_THP_DECODER) += mjpegdec.o mjpeg.o |
222 | 222 |
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o |
223 | 223 |
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o faxcompr.o |
... | ... |
@@ -452,7 +452,6 @@ MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o |
452 | 452 |
MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o |
453 | 453 |
MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o |
454 | 454 |
MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o |
455 |
-MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o |
|
456 | 455 |
MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o |
457 | 456 |
MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o |
458 | 457 |
MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o |
... | ... |
@@ -496,7 +495,6 @@ OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \ |
496 | 496 |
OBJS-$(HAVE_IWMMXT) += arm/dsputil_iwmmxt.o \ |
497 | 497 |
arm/mpegvideo_iwmmxt.o \ |
498 | 498 |
|
499 |
-NEON-OBJS-$(CONFIG_THEORA_DECODER) += arm/vp3dsp_neon.o |
|
500 | 499 |
NEON-OBJS-$(CONFIG_VP3_DECODER) += arm/vp3dsp_neon.o |
501 | 500 |
|
502 | 501 |
OBJS-$(HAVE_NEON) += arm/dsputil_neon.o \ |
... | ... |
@@ -517,7 +515,6 @@ OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ |
517 | 517 |
OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \ |
518 | 518 |
|
519 | 519 |
ALTIVEC-OBJS-$(CONFIG_H264_DECODER) += ppc/h264_altivec.o |
520 |
-ALTIVEC-OBJS-$(CONFIG_THEORA_DECODER) += ppc/vp3dsp_altivec.o |
|
521 | 520 |
ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o |
522 | 521 |
ALTIVEC-OBJS-$(CONFIG_VP3_DECODER) += ppc/vp3dsp_altivec.o |
523 | 522 |
ALTIVEC-OBJS-$(CONFIG_VP5_DECODER) += ppc/vp3dsp_altivec.o |