[FFmpeg-devel] [PATCH]Fix compilation with --disable-everything

[Carl Eugen Hoyos]

> On Sunday 24 February 2013 03:46:19 pm Carl Eugen Hoyos wrote:
> > Hi!
> >
> > Attached patch fixes ticket #2253 for me.

New patch attached.

Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 15e46c7..b5db712 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -299,6 +299,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
 
 #if HAVE_YASM
 
+#if CONFIG_H264QPEL
 /***********************************/
 /* 3Dnow specific */
 
@@ -318,6 +319,7 @@ void ff_put_no_rnd_mpeg4_qpel8_v_lowpass_mmxext(uint8_t *dst, uint8_t *src,
 #undef DEF
 
 #endif /* HAVE_YASM */
+#endif /* CONFIG_H264QPEL */
 
 
 #if HAVE_INLINE_ASM
@@ -768,7 +770,7 @@ static void draw_edges_mmx(uint8_t *buf, int wrap, int width, int height,
 #endif /* HAVE_INLINE_ASM */
 
 
-#if HAVE_YASM
+#if HAVE_YASM && CONFIG_H264QPEL
 #define QPEL_OP(OPNAME, ROUNDER, RND, MMX)                              \
 static void OPNAME ## qpel8_mc00_ ## MMX (uint8_t *dst, uint8_t *src,   \
                                           int stride)                   \
@@ -1153,7 +1155,7 @@ static void OPNAME ## qpel16_mc22_ ## MMX(uint8_t *dst, uint8_t *src,   \
 QPEL_OP(put_,          ff_pw_16, _,        mmxext)
 QPEL_OP(avg_,          ff_pw_16, _,        mmxext)
 QPEL_OP(put_no_rnd_,   ff_pw_15, _no_rnd_, mmxext)
-#endif /* HAVE_YASM */
+#endif /* HAVE_YASM && CONFIG_H264QPEL */
 
 
 #if HAVE_INLINE_ASM
@@ -1633,7 +1635,7 @@ static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
     const int bit_depth      = avctx->bits_per_raw_sample;
     const int high_bit_depth = bit_depth > 8;
 
-#if HAVE_YASM
+#if HAVE_YASM && CONFIG_H264QPEL
     SET_QPEL_FUNCS(avg_qpel,        0, 16, mmxext, );
     SET_QPEL_FUNCS(avg_qpel,        1,  8, mmxext, );
 
@@ -1669,7 +1671,7 @@ static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
             c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_mmxext;
         }
     }
-#endif /* HAVE_YASM */
+#endif /* HAVE_YASM && CONFIG_H264QPEL */
 
 #if HAVE_MMXEXT_EXTERNAL
     if (CONFIG_VP3_DECODER && (avctx->codec_id == AV_CODEC_ID_VP3 ||
@@ -1699,6 +1701,7 @@ static av_cold void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,
     const int high_bit_depth = avctx->bits_per_raw_sample > 8;
 
 #if HAVE_YASM
+#if CONFIG_H264QPEL
     if (!high_bit_depth) {
         c->put_pixels_tab[0][1] = ff_put_pixels16_x2_3dnow;
         c->put_pixels_tab[0][2] = ff_put_pixels16_y2_3dnow;
@@ -1724,6 +1727,7 @@ static av_cold void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,
             c->avg_pixels_tab[1][3] = ff_avg_pixels8_xy2_3dnow;
         }
     }
+#endif /* CONFIG_H264QPEL */
 
     if (CONFIG_VP3_DECODER && (avctx->codec_id == AV_CODEC_ID_VP3 ||
                                avctx->codec_id == AV_CODEC_ID_THEORA)) {