diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-25 16:55:31 +0200 |
| commit | a6ff8514a9bdc93739a73d28913c6b457baff32d (patch) | |
| tree | ed4f3c885586b33b7d8229e606acc80cd8c8ca50 /libavcodec/x86/vc1dsp_mmx.c | |
| parent | fec512a52cdd1bab84958474cc160fdb7be81dec (diff) | |
| parent | dc5385806339f90b4eb074d9002205ebb4010cc2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
wtv: Check the return value from gmtime
x86: fft: convert sse inline asm to yasm
x86: place some inline asm under #if HAVE_INLINE_ASM
Conflicts:
libavcodec/x86/fft_sse.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/vc1dsp_mmx.c')
| -rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index d1cb852f09..4adeabca3b 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -30,6 +30,8 @@ #include "dsputil_mmx.h" #include "libavcodec/vc1dsp.h" +#if HAVE_INLINE_ASM + #define OP_PUT(S,D) #define OP_AVG(S,D) "pavgb " #S ", " #D " \n\t" @@ -682,6 +684,8 @@ static void vc1_inv_trans_8x8_dc_mmx2(uint8_t *dest, int linesize, DCTELEM *bloc ); } +#endif /* HAVE_INLINE_ASM */ + #define LOOP_FILTER(EXT) \ void ff_vc1_v_loop_filter4_ ## EXT(uint8_t *src, int stride, int pq); \ void ff_vc1_h_loop_filter4_ ## EXT(uint8_t *src, int stride, int pq); \ @@ -730,6 +734,7 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) { int mm_flags = av_get_cpu_flags(); +#if HAVE_INLINE_ASM if (mm_flags & AV_CPU_FLAG_MMX) { dsp->put_vc1_mspel_pixels_tab[ 0] = ff_put_vc1_mspel_mc00_mmx; dsp->put_vc1_mspel_pixels_tab[ 4] = put_vc1_mspel_mc01_mmx; @@ -791,6 +796,7 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) dsp->put_no_rnd_vc1_chroma_pixels_tab[0]= ff_put_vc1_chroma_mc8_ssse3_nornd; dsp->avg_no_rnd_vc1_chroma_pixels_tab[0]= ff_avg_vc1_chroma_mc8_ssse3_nornd; } +#endif /* HAVE_INLINE_ASM */ #define ASSIGN_LF(EXT) \ dsp->vc1_v_loop_filter4 = ff_vc1_v_loop_filter4_ ## EXT; \ |