summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 02:01:43 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 02:01:43 +0000
commitd2c1ed2dea1c06f0587a5a1d300c80e12c4e5e1e (patch)
treef8be02c60ae17ac0ef126f7dbd4d77ca52e48d9e /media
parentc04076058872b3d9c20435692bd5ea6c60db6e1c (diff)
downloadchromium_src-d2c1ed2dea1c06f0587a5a1d300c80e12c4e5e1e.zip
chromium_src-d2c1ed2dea1c06f0587a5a1d300c80e12c4e5e1e.tar.gz
chromium_src-d2c1ed2dea1c06f0587a5a1d300c80e12c4e5e1e.tar.bz2
quick fix for emms on linux 64
BUG=none TEST=build on linux 64 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/yuv_row.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/base/yuv_row.h b/media/base/yuv_row.h
index 248a934..2d8a9a6 100644
--- a/media/base/yuv_row.h
+++ b/media/base/yuv_row.h
@@ -95,8 +95,7 @@ void LinearScaleYUVToRGB32Row(const uint8* y_buf,
#define EMMS() asm("emms")
#endif
#else
-//#define EMMS()
-#define EMMS() __asm emms
+#define EMMS()
#endif
#endif // MEDIA_BASE_YUV_ROW_H_