diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 17:32:10 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 17:32:10 +0000 |
| commit | bfa6ecc67b157bc3f54cbce4e37f20e9b3915cf2 (patch) | |
| tree | e4e7ea7455922a8289bdad5493398489bdc23c41 /media | |
| parent | aea233ec5b5dd77600a3b374e5e5c449928688b8 (diff) | |
| download | chromium_src-bfa6ecc67b157bc3f54cbce4e37f20e9b3915cf2.zip chromium_src-bfa6ecc67b157bc3f54cbce4e37f20e9b3915cf2.tar.gz chromium_src-bfa6ecc67b157bc3f54cbce4e37f20e9b3915cf2.tar.bz2 | |
Fix conflicting #define for WebaudioMediaCodecBridge
This conflicts with the #define in MediaCodecBridge
R=dalecurtis@chromium.org
Review URL: https://codereview.chromium.org/14796017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199756 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/webaudio_media_codec_bridge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/base/android/webaudio_media_codec_bridge.h b/media/base/android/webaudio_media_codec_bridge.h index 76de667..573fec2 100644 --- a/media/base/android/webaudio_media_codec_bridge.h +++ b/media/base/android/webaudio_media_codec_bridge.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ -#define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ +#ifndef MEDIA_BASE_ANDROID_WEBAUDIO_MEDIA_CODEC_BRIDGE_H_ +#define MEDIA_BASE_ANDROID_WEBAUDIO_MEDIA_CODEC_BRIDGE_H_ #include <jni.h> @@ -70,4 +70,4 @@ class MEDIA_EXPORT WebAudioMediaCodecBridge { }; } // namespace media -#endif // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_ +#endif // MEDIA_BASE_ANDROID_WEBAUDIO_MEDIA_CODEC_BRIDGE_H_ |