summaryrefslogtreecommitdiff
path: root/libavcodec/dsputil.c
diff options
context:
space:
mode:
authorPanagiotis Issaris <takis.issaris@uhasselt.be>2007-05-23 09:07:23 +0000
committerPanagiotis Issaris <takis.issaris@uhasselt.be>2007-05-23 09:07:23 +0000
commit4edda03480f88548fec2d73230e2cfdfb57c2b84 (patch)
tree8b215138bcea3322a11dfff96d291274dfd6849f /libavcodec/dsputil.c
parent19716d6478c1d2fbfa03f9c1e0c1d51909040a59 (diff)
Make the compilation of h264idct.c optional.
Originally committed as revision 9105 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.c')
-rw-r--r--libavcodec/dsputil.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 9eecaa84ff..4f3152c622 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -3858,7 +3858,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
#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 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
}
}
+ 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;