generic-library/webm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore original namespaces for mkvmuxer and mkvparser.

Browse Source 
Wrapping mkvmuxer and mkvparser in the libwebm namespace is no
longer necessary now that the tree reorganization is complete.
Put mkvmuxer and mkvparser namespaces back in the global
namespace to avoid unnecessary churn in downstream code.

Change-Id: I13a4fe0143d20bb2bb6038078c68636ff2af0c29
This commit is contained in:
Tom Finegan
2016-03-21 12:16:30 -07:00
parent 504e0f2d5b
commit cbe5c40d12
21 changed files with 621 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
testing/parser_tests.cc
View File

@@ -18,21 +18,20 @@
#include "mkvparser/mkvreader.h"
#include "testing/test_util.h"
using libwebm::mkvparser::AudioTrack;
using libwebm::mkvparser::Block;
using libwebm::mkvparser::BlockEntry;
using libwebm::mkvparser::BlockGroup;
using libwebm::mkvparser::Cluster;
using libwebm::mkvparser::CuePoint;
using libwebm::mkvparser::Cues;
using libwebm::mkvparser::MkvReader;
using libwebm::mkvparser::Segment;
using libwebm::mkvparser::SegmentInfo;
using libwebm::mkvparser::Track;
using libwebm::mkvparser::Tracks;
using libwebm::mkvparser::VideoTrack;
using mkvparser::AudioTrack;
using mkvparser::Block;
using mkvparser::BlockEntry;
using mkvparser::BlockGroup;
using mkvparser::Cluster;
using mkvparser::CuePoint;
using mkvparser::Cues;
using mkvparser::MkvReader;
using mkvparser::Segment;
using mkvparser::SegmentInfo;
using mkvparser::Track;
using mkvparser::Tracks;
using mkvparser::VideoTrack;
namespace libwebm {
namespace test {
// Base class containing boiler plate stuff.
@@ -664,7 +663,6 @@ TEST_F(ParserTest, StereoModeParsedCorrectly) {
}
} // namespace test
} // namespace libwebm
int main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);