From 38d9cc51d5572c3e969c976a74064111e6a177b8 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Thu, 26 Feb 2015 09:42:56 +0000 Subject: [PATCH] Add back return statement after FATAL() Some compilers do not accept that non-void functions end with FATAL() instead of a return statement. This change adds back a few return statements that were removed in r8463. BUG=4344 R=phoglund@webrtc.org Review URL: https://webrtc-codereview.appspot.com/42519004 Cr-Commit-Position: refs/heads/master@{#8509} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8509 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/main/acm2/audio_coding_module_impl.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc index 694900a0dc..542aabab9f 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc @@ -736,6 +736,7 @@ int AudioCodingModuleImpl::SendBitrate() const { int AudioCodingModuleImpl::SetReceivedEstimatedBandwidth(int bw) { CriticalSectionScoped lock(acm_crit_sect_); FATAL() << "Dead code?"; + return -1; // return codecs_[current_send_codec_idx_]->SetEstimatedBandwidth(bw); } @@ -1365,6 +1366,7 @@ int AudioCodingModuleImpl::ConfigISACBandwidthEstimator( } FATAL() << "Dead code?"; + return -1; // return codecs_[current_send_codec_idx_]->ConfigISACBandwidthEstimator( // frame_size_ms, rate_bit_per_sec, enforce_frame_size); } @@ -1426,6 +1428,7 @@ int AudioCodingModuleImpl::REDPayloadISAC(int isac_rate, return -1; } FATAL() << "Dead code?"; + return -1; // int status; // status = codecs_[current_send_codec_idx_]->REDPayloadISAC(isac_rate, // isac_bw_estimate,