summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiaomings@google.com <xiaomings@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 18:08:04 +0000
committerxiaomings@google.com <xiaomings@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 18:08:04 +0000
commit55281bc9835c2154e69bcbfadb8487ee03b1f7ba (patch)
tree7cd0262b20893c2259e72f431b7aff88a0907166
parent8158be2429cc3a7a29448b4cdf2cdf559d7ea9a9 (diff)
downloadchromium_src-55281bc9835c2154e69bcbfadb8487ee03b1f7ba.zip
chromium_src-55281bc9835c2154e69bcbfadb8487ee03b1f7ba.tar.gz
chromium_src-55281bc9835c2154e69bcbfadb8487ee03b1f7ba.tar.bz2
Make h264_parser_unittest compilable under linux.
BUG= TEST=Compile Review URL: https://chromiumcodereview.appspot.com/10823063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148975 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/common/gpu/media/h264_parser.h2
-rw-r--r--content/content_tests.gypi3
2 files changed, 3 insertions, 2 deletions
diff --git a/content/common/gpu/media/h264_parser.h b/content/common/gpu/media/h264_parser.h
index ed76f16..e64b1f3 100644
--- a/content/common/gpu/media/h264_parser.h
+++ b/content/common/gpu/media/h264_parser.h
@@ -222,7 +222,7 @@ struct H264SEIRecoveryPoint {
int changing_slice_group_idc;
};
-struct H264SEIMessage {
+struct CONTENT_EXPORT H264SEIMessage {
H264SEIMessage();
enum Type {
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 9bd93891..87e4703 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -727,13 +727,14 @@
},
]
}],
- ['chromeos == 1', {
+ ['chromeos == 1 or OS == "linux"', {
'targets': [
{
'target_name': 'h264_parser_unittest',
'type': 'executable',
'dependencies': [
'content_common',
+ '../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
],
'sources': [