diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-07 13:35:49 +0100 |
| commit | 60a0bc46cdba5f13d557624d3448628328ad0fb0 (patch) | |
| tree | 65788b23d15f155b742e5fd6d85e10c601f1d772 /libavcodec/x86 | |
| parent | c4e394e46008c9e208f666d156f49f7ba500d73a (diff) | |
| parent | a846dccb29d2bb0798af1d47d06100eda9ca87cc (diff) | |
| download | ffmpeg-60a0bc46cdba5f13d557624d3448628328ad0fb0.tar.gz | |
Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
h264chroma: x86: Fix building with yasm disabled
rv34: Drop now unnecessary dsputil dependencies
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/x86/h264chroma_init.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/rv34dsp_init.c | 2 | ||||
| -rw-r--r-- | libavcodec/x86/rv40dsp_init.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 111fdedf47..30264d78c6 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,6 +6,7 @@ OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_GPL) += x86/idct_mmx.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 @@ -51,8 +52,7 @@ YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o x86/dwt_yasm.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 b9783d6693..6fc9a436d3 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 } diff --git a/libavcodec/x86/rv34dsp_init.c b/libavcodec/x86/rv34dsp_init.c index a93096791b..70f86299bb 100644 --- a/libavcodec/x86/rv34dsp_init.c +++ b/libavcodec/x86/rv34dsp_init.c @@ -31,7 +31,7 @@ void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_add_mmxext(uint8_t *dst, ptrdiff_t stride, int16_t *block); -av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) +av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c) { int mm_flags = av_get_cpu_flags(); diff --git a/libavcodec/x86/rv40dsp_init.c b/libavcodec/x86/rv40dsp_init.c index 21cde04c00..51e98520cf 100644 --- a/libavcodec/x86/rv40dsp_init.c +++ b/libavcodec/x86/rv40dsp_init.c @@ -188,7 +188,7 @@ QPEL_FUNCS_SET (OP, 3, 2, OPT) #endif /* HAVE_YASM */ -av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) +av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c) { #if HAVE_YASM int mm_flags = av_get_cpu_flags(); |