diff options
| author | Matthew Oliver <protogonoi@gmail.com> | 2014-11-05 17:26:15 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 15:16:34 +0100 |
| commit | 70205f1799252c3363a5bb5ea7ea5df090f2c88f (patch) | |
| tree | 8396135ee14d5778209b7583150cf07c762bdc09 /libavfilter/libmpcodecs/vf_pp7.c | |
| parent | cc5f7315413251b25cf765a2ada4edea94c0309b (diff) | |
| download | ffmpeg-70205f1799252c3363a5bb5ea7ea5df090f2c88f.tar.gz | |
mpcodecs: Use _INLINE guards for inline asm.
Enabled compilation with compiler without inline asm support.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/libmpcodecs/vf_pp7.c')
| -rw-r--r-- | libavfilter/libmpcodecs/vf_pp7.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/libmpcodecs/vf_pp7.c b/libavfilter/libmpcodecs/vf_pp7.c index 89ed4fe679..0283e5d4e3 100644 --- a/libavfilter/libmpcodecs/vf_pp7.c +++ b/libavfilter/libmpcodecs/vf_pp7.c @@ -155,7 +155,7 @@ static void dctB_c(int16_t *dst, int16_t *src){ } } -#if HAVE_MMX +#if HAVE_MMX_INLINE static void dctB_mmx(int16_t *dst, int16_t *src){ __asm__ volatile ( "movq (%0), %%mm0 \n\t" @@ -397,10 +397,10 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->w>>mpi->chroma_x_shift, mpi->h>>mpi->chroma_y_shift, dmpi->stride[2], mpi->stride[2]); } -#if HAVE_MMX +#if HAVE_MMX_INLINE if(ff_gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t"); #endif -#if HAVE_MMX2 +#if HAVE_MMXEXT_INLINE if(ff_gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t"); #endif @@ -464,7 +464,7 @@ static int vf_open(vf_instance_t *vf, char *args){ case 2: requantize= mediumthresh_c; break; } -#if HAVE_MMX +#if HAVE_MMX_INLINE if(ff_gCpuCaps.hasMMX){ dctB= dctB_mmx; } |