diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
| commit | a36e5920737c6adbddd3e43b760e5de8431db6e0 (patch) | |
| tree | 347d048bb8c8828d50113bf94ace40bf0613f2cd /media/base/simd | |
| parent | 34378da0e9429d394aafdaa771301aff58447cb1 (diff) | |
| download | chromium_org-a36e5920737c6adbddd3e43b760e5de8431db6e0.tar.gz | |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
Diffstat (limited to 'media/base/simd')
| -rw-r--r-- | media/base/simd/filter_yuv_mmx.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/simd/filter_yuv_mmx.cc b/media/base/simd/filter_yuv_mmx.cc index c69d9de651..3991fe72fe 100644 --- a/media/base/simd/filter_yuv_mmx.cc +++ b/media/base/simd/filter_yuv_mmx.cc @@ -16,6 +16,7 @@ namespace media { #if defined(COMPILER_MSVC) // Warning 4799 is about calling emms before the function exits. // We calls emms in a frame level so suppress this warning. +#pragma warning(push) #pragma warning(disable: 4799) #endif @@ -72,7 +73,7 @@ void FilterYUVRows_MMX(uint8* dest, } #if defined(COMPILER_MSVC) -#pragma warning(default: 4799) +#pragma warning(pop) #endif } // namespace media |