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

Unified Diff: media/cast/test/sender.cc

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
Patch Set: Created 5 years, 6 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
« no previous file with comments | « media/cast/sender/h264_vt_encoder_unittest.cc ('k') | media/cast/test/simulator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/test/sender.cc
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc
index e34ecf12354ef1e5dead6b6241bad924bb2242df..e26cb8535f80b6693cf1dd1152aa72dc0723fcf9 100644
--- a/media/cast/test/sender.cc
+++ b/media/cast/test/sender.cc
@@ -204,13 +204,8 @@ int main(int argc, char** argv) {
base::CommandLine::Init(argc, argv);
InitLogging(logging::LoggingSettings());
- // Load the media module for FFmpeg decoding.
- base::FilePath path;
- PathService::Get(base::DIR_MODULE, &path);
- if (!media::InitializeMediaLibrary(path)) {
- LOG(ERROR) << "Could not initialize media library.";
- return 1;
- }
+ // Prepare media module for FFmpeg decoding.
+ media::InitializeMediaLibrary();
base::Thread test_thread("Cast sender test app thread");
base::Thread audio_thread("Cast audio encoder thread");
« no previous file with comments | « media/cast/sender/h264_vt_encoder_unittest.cc ('k') | media/cast/test/simulator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698