diff options
| author | Martin Storsjö <martin@martin.st> | 2013-02-06 16:34:39 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-02-06 17:05:33 +0200 |
| commit | a846dccb29d2bb0798af1d47d06100eda9ca87cc (patch) | |
| tree | 35cfc6861b47b5fd72d36b700ab45cd6b7485643 | |
| parent | 82bd04b170de00bd867e23f329c7c83f7801572c (diff) | |
| download | ffmpeg-a846dccb29d2bb0798af1d47d06100eda9ca87cc.tar.gz | |
h264chroma: x86: Fix building with yasm disabled
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/x86/h264chroma_init.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index f72765af9b..c740573a9f 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -5,6 +5,7 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o OBJS-$(CONFIG_FFT) += x86/fft_init.o +OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o OBJS-$(CONFIG_H264QPEL) += x86/h264_qpel.o @@ -43,8 +44,7 @@ YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o -YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o \ - x86/h264_chromamc.o \ +YASM-OBJS-$(CONFIG_H264CHROMA) += x86/h264_chromamc.o \ x86/h264_chromamc_10bit.o YASM-OBJS-$(CONFIG_H264DSP) += x86/h264_deblock.o \ x86/h264_deblock_10bit.o \ diff --git a/libavcodec/x86/h264chroma_init.c b/libavcodec/x86/h264chroma_init.c index f1f3a19257..b48565804c 100644 --- a/libavcodec/x86/h264chroma_init.c +++ b/libavcodec/x86/h264chroma_init.c @@ -68,6 +68,7 @@ CHROMA_MC(avg, 8, 10, avx) void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) { +#if HAVE_YASM int high_bit_depth = bit_depth > 8; int mm_flags = av_get_cpu_flags(); @@ -113,4 +114,5 @@ void ff_h264chroma_init_x86(H264ChromaContext *c, int bit_depth) c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_10_avx; c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_10_avx; } +#endif } |