diff --git a/modules/video_coding/include/video_error_codes.h b/modules/video_coding/include/video_error_codes.h
index 4ae0ca127d..c4f1a00b84 100644
--- a/modules/video_coding/include/video_error_codes.h
+++ b/modules/video_coding/include/video_error_codes.h
@@ -15,6 +15,7 @@
 
 // Define return values
 
+#define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT 5
 #define WEBRTC_VIDEO_CODEC_OK_REQUEST_KEYFRAME 4
 #define WEBRTC_VIDEO_CODEC_NO_OUTPUT 1
 #define WEBRTC_VIDEO_CODEC_OK 0
@@ -23,7 +24,6 @@
 #define WEBRTC_VIDEO_CODEC_ERR_PARAMETER -4
 #define WEBRTC_VIDEO_CODEC_UNINITIALIZED -7
 #define WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE -13
-#define WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT -14
 #define WEBRTC_VIDEO_CODEC_ERR_SIMULCAST_PARAMETERS_NOT_SUPPORTED -15
 #define WEBRTC_VIDEO_CODEC_ENCODER_FAILURE -16
 
diff --git a/sdk/android/api/org/webrtc/VideoCodecStatus.java b/sdk/android/api/org/webrtc/VideoCodecStatus.java
index a86d6fbf67..670d255880 100644
--- a/sdk/android/api/org/webrtc/VideoCodecStatus.java
+++ b/sdk/android/api/org/webrtc/VideoCodecStatus.java
@@ -15,6 +15,7 @@ package org.webrtc;
  * video_error_codes.h.
  */
 public enum VideoCodecStatus {
+  TARGET_BITRATE_OVERSHOOT(5),
   REQUEST_SLI(2),
   NO_OUTPUT(1),
   OK(0),
@@ -26,8 +27,7 @@ public enum VideoCodecStatus {
   TIMEOUT(-6),
   UNINITIALIZED(-7),
   ERR_REQUEST_SLI(-12),
-  FALLBACK_SOFTWARE(-13),
-  TARGET_BITRATE_OVERSHOOT(-14);
+  FALLBACK_SOFTWARE(-13);
 
   private final int number;
 
diff --git a/video/video_stream_encoder.cc b/video/video_stream_encoder.cc
index 8bf8ce2272..249514e195 100644
--- a/video/video_stream_encoder.cc
+++ b/video/video_stream_encoder.cc
@@ -1894,15 +1894,9 @@ void VideoStreamEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
   was_encode_called_since_last_initialization_ = true;
 
   if (encode_status < 0) {
-    if (encode_status == WEBRTC_VIDEO_CODEC_ENCODER_FAILURE) {
-      RTC_LOG(LS_ERROR) << "Encoder failed, failing encoder format: "
-                        << encoder_config_.video_format.ToString();
-      RequestEncoderSwitch();
-    } else {
-      RTC_LOG(LS_ERROR) << "Failed to encode frame. Error code: "
-                        << encode_status;
-    }
-
+    RTC_LOG(LS_ERROR) << "Encoder failed, failing encoder format: "
+                      << encoder_config_.video_format.ToString();
+    RequestEncoderSwitch();
     return;
   }