Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(511)

Unified Diff: media/test/ffmpeg_tests/ffmpeg_tests.cc

Issue 6537022: Move media library path resolution into Chrome path provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: And again, this time with working tests... Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/test/ffmpeg_tests/ffmpeg_tests.cc
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc
index 5745fe955458a08a2647a6f8d3491304d2101104..4eff9a3ba19e65d3ae4b1972c0469c52681154e4 100644
--- a/media/test/ffmpeg_tests/ffmpeg_tests.cc
+++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc
@@ -81,7 +81,8 @@ int main(int argc, const char** argv) {
// Initialize our media library (try loading DLLs, etc.) before continuing.
// We use an empty file path as the parameter to force searching of the
// default locations for necessary DLLs and DSOs.
- if (media::InitializeMediaLibrary(FilePath()) == false) {
+ media::InitializeMediaLibrary(FilePath());
+ if (media::IsMediaLibraryInitialized() == false) {
std::cerr << "Unable to initialize the media library.";
return 1;
}
@@ -499,4 +500,3 @@ int main(int argc, const char** argv) {
CommandLine::Reset();
return 0;
}
-

Powered by Google App Engine
This is Rietveld 408576698