virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Make vp3dsp*.c compilation optional.

Browse Source 
Originally committed as revision 9025 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Panagiotis Issaris 2007-05-14 14:28:13 +00:00
parent e36d79c837
commit 9b5dc86746
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/Makefile
View File

@ -31,7 +31,6 @@ OBJS= bitstream.o \
cabac.o\ cabac.o\
faandct.o \ faandct.o \
parser.o \ parser.o \
vp3dsp.o \
h264idct.o \ h264idct.o \
rangecoder.o \ rangecoder.o \
h263.o \ h263.o \
@ -162,7 +161,7 @@ OBJS-$(CONFIG_SVQ1_ENCODER) += svq1.o
OBJS-$(CONFIG_SVQ3_DECODER) += h264.o OBJS-$(CONFIG_SVQ3_DECODER) += h264.o
OBJS-$(CONFIG_TARGA_DECODER) += targa.o OBJS-$(CONFIG_TARGA_DECODER) += targa.o
OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o OBJS-$(CONFIG_TARGA_ENCODER) += targaenc.o rle.o
OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o OBJS-$(CONFIG_THEORA_DECODER) += vp3.o xiph.o vp3dsp.o
OBJS-$(CONFIG_THP_DECODER) += mjpeg.o jpeglsdec.o jpegls.o OBJS-$(CONFIG_THP_DECODER) += mjpeg.o jpeglsdec.o jpegls.o
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o
@ -182,9 +181,9 @@ OBJS-$(CONFIG_VMDVIDEO_DECODER) += vmdav.o
OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o OBJS-$(CONFIG_VMNC_DECODER) += vmnc.o
OBJS-$(CONFIG_VORBIS_DECODER) += vorbis_dec.o vorbis.o vorbis_data.o xiph.o OBJS-$(CONFIG_VORBIS_DECODER) += vorbis_dec.o vorbis.o vorbis_data.o xiph.o
OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o OBJS-$(CONFIG_VORBIS_ENCODER) += vorbis_enc.o vorbis.o vorbis_data.o
OBJS-$(CONFIG_VP3_DECODER) += vp3.o OBJS-$(CONFIG_VP3_DECODER) += vp3.o vp3dsp.o
OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o OBJS-$(CONFIG_VP5_DECODER) += vp5.o vp56.o vp56data.o vp3dsp.o
OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o OBJS-$(CONFIG_VP6_DECODER) += vp6.o vp56.o vp56data.o vp3dsp.o
OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o OBJS-$(CONFIG_VQA_DECODER) += vqavideo.o
OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o OBJS-$(CONFIG_WAVPACK_DECODER) += wavpack.o
OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o OBJS-$(CONFIG_WMAV1_DECODER) += wmadec.o wma.o
@ -337,14 +336,15 @@ OBJS += i386/fdct_mmx.o \
i386/simple_idct_mmx.o \ i386/simple_idct_mmx.o \
i386/idct_mmx_xvid.o \ i386/idct_mmx_xvid.o \
i386/fft_sse.o \ i386/fft_sse.o \
i386/vp3dsp_mmx.o \
i386/vp3dsp_sse2.o \
i386/fft_3dn.o \ i386/fft_3dn.o \
i386/fft_3dn2.o \ i386/fft_3dn2.o \
OBJS-$(CONFIG_GPL) += i386/idct_mmx.o OBJS-$(CONFIG_GPL) += i386/idct_mmx.o
OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o OBJS-$(CONFIG_CAVS_DECODER) += i386/cavsdsp_mmx.o
OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o OBJS-$(CONFIG_SNOW_DECODER) += i386/snowdsp_mmx.o
OBJS-$(CONFIG_VP3_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP5_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
OBJS-$(CONFIG_VP6_DECODER) += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
endif endif
ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \ ASM_OBJS-$(TARGET_ARCH_ARMV4L) += armv4l/jrevdct_arm.o \

3
libavcodec/dsputil.c
View File

@ -3883,7 +3883,8 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
c->idct_add= ff_jref_idct_add; c->idct_add= ff_jref_idct_add;
c->idct = j_rev_dct; c->idct = j_rev_dct;
c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
}else if(avctx->idct_algo==FF_IDCT_VP3){ }else if((ENABLE_VP3_DECODER || ENABLE_VP5_DECODER || ENABLE_VP6_DECODER || ENABLE_THEORA_DECODER ) &&
avctx->idct_algo==FF_IDCT_VP3){
c->idct_put= ff_vp3_idct_put_c; c->idct_put= ff_vp3_idct_put_c;
c->idct_add= ff_vp3_idct_add_c; c->idct_add= ff_vp3_idct_add_c;
c->idct = ff_vp3_idct_c; c->idct = ff_vp3_idct_c;

3
libavcodec/i386/dsputil_mmx.c
View File

@ -3279,7 +3279,8 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
} }
c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
#endif #endif
}else if(idct_algo==FF_IDCT_VP3 && }else if((ENABLE_VP3_DECODER || ENABLE_VP5_DECODER || ENABLE_VP6_DECODER) &&
idct_algo==FF_IDCT_VP3 &&
avctx->codec->id!=CODEC_ID_THEORA && avctx->codec->id!=CODEC_ID_THEORA &&
!(avctx->flags & CODEC_FLAG_BITEXACT)){ !(avctx->flags & CODEC_FLAG_BITEXACT)){
if(mm_flags & MM_SSE2){ if(mm_flags & MM_SSE2){