diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libswscale/swscale-example.c | |
parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libswscale/swscale-example.c')
-rw-r--r-- | libswscale/swscale-example.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c index b5f8d5e230..c67b4c0420 100644 --- a/libswscale/swscale-example.c +++ b/libswscale/swscale-example.c @@ -120,7 +120,7 @@ static int doTest(uint8_t *ref[3], int refStride[3], int w, int h, int srcFormat sws_scale(outContext, dst, dstStride, 0, dstH, out, refStride); #if defined(ARCH_X86) - asm volatile ("emms\n\t"); + __asm__ volatile ("emms\n\t"); #endif ssdY= getSSD(ref[0], out[0], refStride[0], refStride[0], w, h); @@ -215,7 +215,7 @@ int main(int argc, char **argv){ sws_scale(sws, rgb_src, rgb_stride, 0, H, src, stride); #if defined(ARCH_X86) - asm volatile ("emms\n\t"); + __asm__ volatile ("emms\n\t"); #endif selfTest(src, stride, W, H); |