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

10
testing/test_util.cc
View File

@@ -21,7 +21,6 @@
#include "common/libwebm_util.h"
namespace libwebm {
namespace test {
std::string GetTestDataDir() {
@@ -39,8 +38,10 @@ bool CompareFiles(const std::string& file1, const std::string& file2) {
std::uint8_t buf1[kBlockSize] = {0};
std::uint8_t buf2[kBlockSize] = {0};
FilePtr f1 = FilePtr(std::fopen(file1.c_str(), "rb"), FILEDeleter());
FilePtr f2 = FilePtr(std::fopen(file2.c_str(), "rb"), FILEDeleter());
libwebm::FilePtr f1 =
libwebm::FilePtr(std::fopen(file1.c_str(), "rb"), libwebm::FILEDeleter());
libwebm::FilePtr f2 =
libwebm::FilePtr(std::fopen(file2.c_str(), "rb"), libwebm::FILEDeleter());
if (!f1.get() || !f2.get()) {
// Files cannot match if one or both couldn't be opened.
@@ -59,5 +60,4 @@ bool CompareFiles(const std::string& file1, const std::string& file2) {
return std::feof(f1.get()) && std::feof(f2.get());
}
} // namespace test
} // namespace libwebm
} // namespace test