repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.3~trusty1
[deb_ffmpeg.git]
/
ffmpeg
/
libavfilter
/
libmpcodecs
/
vf_uspp.c
diff --git
a/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c
b/ffmpeg/libavfilter/libmpcodecs/vf_uspp.c
index c9d9c1fd169fd1fa5906a94d8305c24f37cef842..fb4329d25266ee29afa642e8b6d5db584b292ed6 100644
(file)
--- a/
ffmpeg/libavfilter/libmpcodecs/vf_uspp.c
+++ b/
ffmpeg/libavfilter/libmpcodecs/vf_uspp.c
@@
-297,10
+297,10
@@
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
}
}
}
}
-#if HAVE_MMX
+#if HAVE_MMX
_INLINE
if(ff_gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t");
#endif
if(ff_gCpuCaps.hasMMX) __asm__ volatile ("emms\n\t");
#endif
-#if HAVE_MMX
2
+#if HAVE_MMX
EXT_INLINE
if(ff_gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t");
#endif
if(ff_gCpuCaps.hasMMX2) __asm__ volatile ("sfence\n\t");
#endif
@@
-375,7
+375,7
@@
static int vf_open(vf_instance_t *vf, char *args){
if(vf->priv->qp < 0)
vf->priv->qp = 0;
if(vf->priv->qp < 0)
vf->priv->qp = 0;
-// #if HAVE_MMX
+// #if HAVE_MMX
_INLINE
// if(ff_gCpuCaps.hasMMX){
// store_slice= store_slice_mmx;
// }
// if(ff_gCpuCaps.hasMMX){
// store_slice= store_slice_mmx;
// }