Revision 4edda034

View differences:

libavcodec/Makefile
26 26
      raw.o \
27 27
      faandct.o \
28 28
      parser.o \
29
      h264idct.o \
30 29
      rangecoder.o \
31 30
      h263.o \
32 31
      opt.o \
......
84 83
OBJS-$(CONFIG_H261_DECODER)            += h261dec.o h261.o
85 84
OBJS-$(CONFIG_H261_ENCODER)            += h261enc.o h261.o
86 85
OBJS-$(CONFIG_H263_DECODER)            += h263dec.o
87
OBJS-$(CONFIG_H264_DECODER)            += h264.o cabac.o golomb.o
86
OBJS-$(CONFIG_H264_DECODER)            += h264.o h264idct.o cabac.o golomb.o
88 87
OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dsp.o
89 88
OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o
90 89
OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o
libavcodec/dsputil.c
3858 3858
#endif //CONFIG_ENCODERS
3859 3859

  
3860 3860
    if(avctx->lowres==1){
3861
        if(avctx->idct_algo==FF_IDCT_INT || avctx->idct_algo==FF_IDCT_AUTO){
3861
        if(avctx->idct_algo==FF_IDCT_INT || avctx->idct_algo==FF_IDCT_AUTO || !ENABLE_H264_DECODER){
3862 3862
            c->idct_put= ff_jref_idct4_put;
3863 3863
            c->idct_add= ff_jref_idct4_add;
3864 3864
        }else{
......
3897 3897
        }
3898 3898
    }
3899 3899

  
3900
    if (ENABLE_H264_DECODER) {
3900 3901
    c->h264_idct_add= ff_h264_idct_add_c;
3901 3902
    c->h264_idct8_add= ff_h264_idct8_add_c;
3902 3903
    c->h264_idct_dc_add= ff_h264_idct_dc_add_c;
3903 3904
    c->h264_idct8_dc_add= ff_h264_idct8_dc_add_c;
3905
    }
3904 3906

  
3905 3907
    c->get_pixels = get_pixels_c;
3906 3908
    c->diff_pixels = diff_pixels_c;

Also available in: Unified diff