diff --git a/AUTHORS b/AUTHORS index 3a73bd6166..121838fc23 100644 --- a/AUTHORS +++ b/AUTHORS @@ -68,6 +68,7 @@ Intel Corporation <*@intel.com> MIPS Technologies <*@mips.com> Mozilla Foundation <*@mozilla.com> Opera Software ASA <*@opera.com> +Optical Tone Ltd <*@opticaltone.com> Sinch AB <*@sinch.com> struktur AG <*@struktur.de> Telenor Digital AS <*@telenor.com> diff --git a/examples/peerconnection/server/main.cc b/examples/peerconnection/server/main.cc index d26a1da4d7..1df34bb8c4 100644 --- a/examples/peerconnection/server/main.cc +++ b/examples/peerconnection/server/main.cc @@ -46,7 +46,7 @@ void HandleBrowserRequest(DataSocket* ds, bool* quit) { } } -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { std::string program_name = argv[0]; std::string usage = "Example usage: " + program_name + " --port=8888"; webrtc::test::CommandLineParser parser; diff --git a/examples/stunprober/main.cc b/examples/stunprober/main.cc index e0f98773fe..973db39d77 100644 --- a/examples/stunprober/main.cc +++ b/examples/stunprober/main.cc @@ -100,7 +100,7 @@ void StopTrial(rtc::Thread* thread, StunProber* prober, int result) { } // namespace -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true); if (FLAG_help) { rtc::FlagList::Print(nullptr, false); diff --git a/examples/turnserver/turnserver_main.cc b/examples/turnserver/turnserver_main.cc index 5433f951c1..9bee8518aa 100644 --- a/examples/turnserver/turnserver_main.cc +++ b/examples/turnserver/turnserver_main.cc @@ -41,7 +41,7 @@ class TurnFileAuth : public cricket::TurnAuthInterface { rtc::OptionsFile file_; }; -int main(int argc, char **argv) { +int main(int argc, char* argv[]) { if (argc != 5) { std::cerr << "usage: turnserver int-addr ext-ip realm auth-file" << std::endl; diff --git a/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc b/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc index a53e7bd0b5..4194478de7 100644 --- a/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc +++ b/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc @@ -455,4 +455,5 @@ int main(int argc, char* argv[]) //} } } + return 0; } diff --git a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc index e2d0907dee..de7ff2ea99 100644 --- a/modules/audio_coding/neteq/tools/neteq_rtpplay.cc +++ b/modules/audio_coding/neteq/tools/neteq_rtpplay.cc @@ -677,5 +677,5 @@ int RunTest(int argc, char* argv[]) { } // namespace webrtc int main(int argc, char* argv[]) { - webrtc::test::RunTest(argc, argv); + return webrtc::test::RunTest(argc, argv); } diff --git a/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc index 2c0e54b0cb..2f9bb681e7 100644 --- a/modules/audio_coding/test/insert_packet_with_timing.cc +++ b/modules/audio_coding/test/insert_packet_with_timing.cc @@ -319,4 +319,5 @@ int main(int argc, char* argv[]) { test.TearDown(); if (delay_log != NULL) fclose(delay_log); + return 0; } diff --git a/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc b/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc index 7dae0408a1..887921b6ae 100644 --- a/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc +++ b/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc @@ -38,7 +38,7 @@ class Observer : public webrtc::RemoteBitrateObserver { webrtc::Clock* clock_; }; -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { webrtc::test::RtpFileReader* reader; webrtc::RemoteBitrateEstimator* estimator; webrtc::RtpHeaderParser* parser; diff --git a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc index 6ff705a49d..54f027a069 100644 --- a/modules/remote_bitrate_estimator/tools/rtp_to_text.cc +++ b/modules/remote_bitrate_estimator/tools/rtp_to_text.cc @@ -19,7 +19,7 @@ #include "rtc_base/format_macros.h" #include "test/rtp_file_reader.h" -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { webrtc::test::RtpFileReader* reader; webrtc::RtpHeaderParser* parser; if (!ParseArgsAndSetupEstimator(argc, argv, NULL, NULL, &reader, &parser, diff --git a/rtc_base/unittest_main.cc b/rtc_base/unittest_main.cc index cff32eff83..80b988d256 100644 --- a/rtc_base/unittest_main.cc +++ b/rtc_base/unittest_main.cc @@ -67,7 +67,7 @@ int TestCrtReportHandler(int report_type, char* msg, int* retval) { } #endif // WEBRTC_WIN -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { testing::InitGoogleTest(&argc, argv); rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, false); if (FLAG_help) { diff --git a/rtc_tools/converter/rgba_to_i420_converter.cc b/rtc_tools/converter/rgba_to_i420_converter.cc index 23342402a8..e08dd8a6b6 100644 --- a/rtc_tools/converter/rgba_to_i420_converter.cc +++ b/rtc_tools/converter/rgba_to_i420_converter.cc @@ -26,7 +26,7 @@ * --output_file= --width= * --height= */ -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { std::string program_name = argv[0]; std::string usage = "Converts RGBA raw image files to I420 frames for YUV.\n" "Example usage:\n" + program_name + diff --git a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc index 40fb023f18..2cd1b36d90 100644 --- a/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc +++ b/rtc_tools/force_mic_volume_max/force_mic_volume_max.cc @@ -22,7 +22,7 @@ using webrtc::AudioDeviceModule; #define DEFAULT_INPUT_DEVICE (0) #endif -int main(int /*argc*/, char** /*argv*/) { +int main(int /*argc*/, char* /*argv*/ []) { // Create and initialize the ADM. rtc::scoped_refptr adm( AudioDeviceModule::Create(AudioDeviceModule::kPlatformDefaultAudio)); diff --git a/rtc_tools/frame_analyzer/frame_analyzer.cc b/rtc_tools/frame_analyzer/frame_analyzer.cc index 98f4743043..d7851e6b12 100644 --- a/rtc_tools/frame_analyzer/frame_analyzer.cc +++ b/rtc_tools/frame_analyzer/frame_analyzer.cc @@ -39,7 +39,7 @@ * --stats_file= --width= * --height= */ -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { std::string program_name = argv[0]; std::string usage = "Compares the output video with the initially sent video." @@ -107,4 +107,5 @@ int main(int argc, char** argv) { webrtc::test::PrintMaxRepeatedAndSkippedFrames( label, parser.GetFlag("stats_file_ref"), parser.GetFlag("stats_file_test")); + return 0; } diff --git a/rtc_tools/frame_analyzer/reference_less_video_analysis.cc b/rtc_tools/frame_analyzer/reference_less_video_analysis.cc index d75b3af731..4e87bc9a55 100644 --- a/rtc_tools/frame_analyzer/reference_less_video_analysis.cc +++ b/rtc_tools/frame_analyzer/reference_less_video_analysis.cc @@ -14,7 +14,7 @@ #include "rtc_tools/frame_analyzer/reference_less_video_analysis_lib.h" #include "rtc_tools/simple_command_line_parser.h" -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { // This captures the freezing metrics for reference less video analysis. std::string program_name = argv[0]; std::string usage = "Outputs the freezing score by comparing current frame " diff --git a/rtc_tools/frame_editing/frame_editing.cc b/rtc_tools/frame_editing/frame_editing.cc index 45af7fed41..67ca9cca82 100644 --- a/rtc_tools/frame_editing/frame_editing.cc +++ b/rtc_tools/frame_editing/frame_editing.cc @@ -17,7 +17,7 @@ #include "rtc_tools/simple_command_line_parser.h" // A command-line tool to edit a YUV-video (I420 sub-sampled). -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { std::string program_name = argv[0]; std::string usage = "Deletes a series of frames in a yuv file." " Only I420 is supported!\n" diff --git a/rtc_tools/network_tester/server.cc b/rtc_tools/network_tester/server.cc index 6edd9f958f..25ca5a1d37 100644 --- a/rtc_tools/network_tester/server.cc +++ b/rtc_tools/network_tester/server.cc @@ -10,10 +10,11 @@ #include "rtc_tools/network_tester/test_controller.h" -int main() { +int main(int /*argn*/, char* /*argv*/ []) { webrtc::TestController server(9090, 9090, "server_config.dat", "server_packet_log.dat"); while (!server.IsTestDone()) { server.Run(); } + return 0; } diff --git a/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc b/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc index ac1c8d997a..0fefb5769a 100644 --- a/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc +++ b/rtc_tools/psnr_ssim_analyzer/psnr_ssim_analyzer.cc @@ -80,7 +80,7 @@ void CompareFiles(const char* reference_file_name, const char* test_file_name, * --results_file= --width= * --height= */ -int main(int argc, char** argv) { +int main(int argc, char* argv[]) { std::string program_name = argv[0]; std::string usage = "Runs PSNR and SSIM on two I420 videos and write the" "results in a file.\n" @@ -130,4 +130,5 @@ int main(int argc, char** argv) { CompareFiles(parser.GetFlag("reference_file").c_str(), parser.GetFlag("test_file").c_str(), parser.GetFlag("results_file").c_str(), width, height); + return 0; }