Revision 9b5dc867

View differences:

libavcodec/Makefile
31 31
      cabac.o\
32 32
      faandct.o \
33 33
      parser.o \
34
      vp3dsp.o \
35 34
      h264idct.o \
36 35
      rangecoder.o \
37 36
      h263.o \
......
162 161
OBJS-$(CONFIG_SVQ3_DECODER)            += h264.o
163 162
OBJS-$(CONFIG_TARGA_DECODER)           += targa.o
164 163
OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o
165
OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o xiph.o
164
OBJS-$(CONFIG_THEORA_DECODER)          += vp3.o xiph.o vp3dsp.o
166 165
OBJS-$(CONFIG_THP_DECODER)             += mjpeg.o jpeglsdec.o jpegls.o
167 166
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
168 167
OBJS-$(CONFIG_TIFF_DECODER)            += tiff.o lzw.o
......
182 181
OBJS-$(CONFIG_VMNC_DECODER)            += vmnc.o
183 182
OBJS-$(CONFIG_VORBIS_DECODER)          += vorbis_dec.o vorbis.o vorbis_data.o xiph.o
184 183
OBJS-$(CONFIG_VORBIS_ENCODER)          += vorbis_enc.o vorbis.o vorbis_data.o
185
OBJS-$(CONFIG_VP3_DECODER)             += vp3.o
186
OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o
187
OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o
184
OBJS-$(CONFIG_VP3_DECODER)             += vp3.o vp3dsp.o
185
OBJS-$(CONFIG_VP5_DECODER)             += vp5.o vp56.o vp56data.o vp3dsp.o
186
OBJS-$(CONFIG_VP6_DECODER)             += vp6.o vp56.o vp56data.o vp3dsp.o
188 187
OBJS-$(CONFIG_VQA_DECODER)             += vqavideo.o
189 188
OBJS-$(CONFIG_WAVPACK_DECODER)         += wavpack.o
190 189
OBJS-$(CONFIG_WMAV1_DECODER)           += wmadec.o wma.o
......
337 336
        i386/simple_idct_mmx.o \
338 337
        i386/idct_mmx_xvid.o \
339 338
        i386/fft_sse.o \
340
        i386/vp3dsp_mmx.o \
341
        i386/vp3dsp_sse2.o \
342 339
        i386/fft_3dn.o \
343 340
        i386/fft_3dn2.o \
344 341

  
345 342
OBJS-$(CONFIG_GPL)                     += i386/idct_mmx.o
346 343
OBJS-$(CONFIG_CAVS_DECODER)            += i386/cavsdsp_mmx.o
347 344
OBJS-$(CONFIG_SNOW_DECODER)            += i386/snowdsp_mmx.o
345
OBJS-$(CONFIG_VP3_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
346
OBJS-$(CONFIG_VP5_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
347
OBJS-$(CONFIG_VP6_DECODER)             += i386/vp3dsp_mmx.o i386/vp3dsp_sse2.o
348 348
endif
349 349

  
350 350
ASM_OBJS-$(TARGET_ARCH_ARMV4L)         += armv4l/jrevdct_arm.o     \
libavcodec/dsputil.c
3883 3883
            c->idct_add= ff_jref_idct_add;
3884 3884
            c->idct    = j_rev_dct;
3885 3885
            c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
3886
        }else if(avctx->idct_algo==FF_IDCT_VP3){
3886
        }else if((ENABLE_VP3_DECODER || ENABLE_VP5_DECODER || ENABLE_VP6_DECODER || ENABLE_THEORA_DECODER ) &&
3887
                avctx->idct_algo==FF_IDCT_VP3){
3887 3888
            c->idct_put= ff_vp3_idct_put_c;
3888 3889
            c->idct_add= ff_vp3_idct_add_c;
3889 3890
            c->idct    = ff_vp3_idct_c;
libavcodec/i386/dsputil_mmx.c
3279 3279
                }
3280 3280
                c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM;
3281 3281
#endif
3282
            }else if(idct_algo==FF_IDCT_VP3 &&
3282
            }else if((ENABLE_VP3_DECODER || ENABLE_VP5_DECODER || ENABLE_VP6_DECODER) &&
3283
                     idct_algo==FF_IDCT_VP3 &&
3283 3284
                     avctx->codec->id!=CODEC_ID_THEORA &&
3284 3285
                     !(avctx->flags & CODEC_FLAG_BITEXACT)){
3285 3286
                if(mm_flags & MM_SSE2){

Also available in: Unified diff