diff options
author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 00:14:37 +0000 |
---|---|---|
committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 00:14:37 +0000 |
commit | afae0fbd3bfd2727b873af06d04ecb12a58138aa (patch) | |
tree | 8485484f69927e2389448a814b65eb19adfc188c /media/media.gyp | |
parent | 428e8200c272439b8d540e41a425ab9078c46031 (diff) | |
download | chromium_src-afae0fbd3bfd2727b873af06d04ecb12a58138aa.zip chromium_src-afae0fbd3bfd2727b873af06d04ecb12a58138aa.tar.gz chromium_src-afae0fbd3bfd2727b873af06d04ecb12a58138aa.tar.bz2 |
Add support for BlockGroup elements with BlockDuration.
BUG=127915
TEST=WebMClusterParserTest.ParseBlockGroup & WebMClusterParserTest.ParseSimpleBlockAndBlockGroupMixture.
Review URL: https://chromiumcodereview.appspot.com/10391091
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r-- | media/media.gyp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index d42fe5e..d9535ad 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -680,8 +680,9 @@ 'video/capture/video_capture_device_unittest.cc', 'webm/cluster_builder.cc', 'webm/cluster_builder.h', - 'webm/webm_parser_unittest.cc', + 'webm/webm_cluster_parser_unittest.cc', 'webm/webm_content_encodings_client_unittest.cc', + 'webm/webm_parser_unittest.cc', ], 'conditions': [ ['os_posix==1 and OS!="mac"', { @@ -713,6 +714,7 @@ 'filters/ffmpeg_video_decoder_unittest.cc', 'filters/pipeline_integration_test.cc', 'filters/pipeline_integration_test_base.cc', + 'webm/webm_cluster_parser_unittest.cc', ], }], ['OS == "linux"', { |