diff options
author | wolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 07:09:20 +0000 |
---|---|---|
committer | wolenetz@chromium.org <wolenetz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-06 07:09:20 +0000 |
commit | 476e821a927581f03e07c5a88a0d242aa82e3c23 (patch) | |
tree | 4cd58fa24ef426c0da4def137339d433aed65cc6 /webkit/media | |
parent | 23afbbfe148d6ca5d1886cd35b7aa61124b53b12 (diff) | |
download | chromium_src-476e821a927581f03e07c5a88a0d242aa82e3c23.zip chromium_src-476e821a927581f03e07c5a88a0d242aa82e3c23.tar.gz chromium_src-476e821a927581f03e07c5a88a0d242aa82e3c23.tar.bz2 |
Fix a compile assert macro undef to match define
This compile assert was not correctly undefined previously.
BUG=
TEST=Compile succeeds on linux x64, layout tests pass (with expected mp4
IsTypeSupported true on build with ffmpeg_branding=Chrome
proprietary_codecs=1, all media_unittests pass except for unrelated
AudioInputVolumeTest.InputVolumeTest
R=acolwell@chromium.org
Review URL: https://chromiumcodereview.appspot.com/13594012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
-rw-r--r-- | webkit/media/webmediasourceclient_impl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/media/webmediasourceclient_impl.cc b/webkit/media/webmediasourceclient_impl.cc index e764fb1..a0024f6 100644 --- a/webkit/media/webmediasourceclient_impl.cc +++ b/webkit/media/webmediasourceclient_impl.cc @@ -22,7 +22,7 @@ namespace webkit_media { COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk); COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusNotSupported, kNotSupported); COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusReachedIdLimit, kReachedIdLimit); -#undef COMPILE_ASSERT_MATCHING_ENUM +#undef COMPILE_ASSERT_MATCHING_STATUS_ENUM WebMediaSourceClientImpl::WebMediaSourceClientImpl( const scoped_refptr<media::ChunkDemuxer>& demuxer, |