# HG changeset patch # User takis # Date 1179911243 0 # Node ID 670618daaeb1383c9dd28ebc6fbcbabba6fa8f35 # Parent d5640ea6d4a6c4c5467f25c6ca04035469ad4f3b Make the compilation of h264idct.c optional. diff -r d5640ea6d4a6 -r 670618daaeb1 Makefile --- a/Makefile Wed May 23 09:02:07 2007 +0000 +++ b/Makefile Wed May 23 09:07:23 2007 +0000 @@ -26,7 +26,6 @@ raw.o \ faandct.o \ parser.o \ - h264idct.o \ rangecoder.o \ h263.o \ opt.o \ @@ -84,7 +83,7 @@ OBJS-$(CONFIG_H261_DECODER) += h261dec.o h261.o OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o OBJS-$(CONFIG_H263_DECODER) += h263dec.o -OBJS-$(CONFIG_H264_DECODER) += h264.o cabac.o golomb.o +OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o cabac.o golomb.o OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dsp.o OBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuv.o OBJS-$(CONFIG_HUFFYUV_ENCODER) += huffyuv.o diff -r d5640ea6d4a6 -r 670618daaeb1 dsputil.c --- a/dsputil.c Wed May 23 09:02:07 2007 +0000 +++ b/dsputil.c Wed May 23 09:07:23 2007 +0000 @@ -3858,7 +3858,7 @@ #endif //CONFIG_ENCODERS if(avctx->lowres==1){ - if(avctx->idct_algo==FF_IDCT_INT || avctx->idct_algo==FF_IDCT_AUTO){ + if(avctx->idct_algo==FF_IDCT_INT || avctx->idct_algo==FF_IDCT_AUTO || !ENABLE_H264_DECODER){ c->idct_put= ff_jref_idct4_put; c->idct_add= ff_jref_idct4_add; }else{ @@ -3897,10 +3897,12 @@ } } + if (ENABLE_H264_DECODER) { c->h264_idct_add= ff_h264_idct_add_c; c->h264_idct8_add= ff_h264_idct8_add_c; c->h264_idct_dc_add= ff_h264_idct_dc_add_c; c->h264_idct8_dc_add= ff_h264_idct8_dc_add_c; + } c->get_pixels = get_pixels_c; c->diff_pixels = diff_pixels_c;