diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc
index 7e26bea4e3..e501368940 100644
--- a/webrtc/modules/video_coding/main/source/codec_database.cc
+++ b/webrtc/modules/video_coding/main/source/codec_database.cc
@@ -344,12 +344,6 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
         return true;
       }
       break;
-    case kVideoCodecGeneric:
-      break;
-    // Known codecs without payload-specifics
-    case kVideoCodecI420:
-    case kVideoCodecRED:
-    case kVideoCodecULPFEC:
     case kVideoCodecH264:
       if (memcmp(&new_send_codec.codecSpecific.H264,
                  &send_codec_.codecSpecific.H264,
@@ -357,6 +351,13 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
         return true;
       }
       break;
+    case kVideoCodecGeneric:
+      break;
+    // Known codecs without payload-specifics
+    case kVideoCodecI420:
+    case kVideoCodecRED:
+    case kVideoCodecULPFEC:
+      break;
     // Unknown codec type, reset just to be sure.
     case kVideoCodecUnknown:
       return true;
diff --git a/webrtc/modules/video_coding/main/source/internal_defines.h b/webrtc/modules/video_coding/main/source/internal_defines.h
index 1128312be3..ef42c62801 100644
--- a/webrtc/modules/video_coding/main/source/internal_defines.h
+++ b/webrtc/modules/video_coding/main/source/internal_defines.h
@@ -35,21 +35,21 @@ inline uint32_t MaskWord64ToUWord32(int64_t w64)
 // Helper macros for creating the static codec list
 #define VCM_NO_CODEC_IDX -1
 #ifdef VIDEOCODEC_VP8
-  #define VCM_VP8_IDX VCM_NO_CODEC_IDX + 1
+  #define VCM_VP8_IDX (VCM_NO_CODEC_IDX + 1)
 #else
   #define VCM_VP8_IDX VCM_NO_CODEC_IDX
 #endif
 #ifdef VIDEOCODEC_H264
-  #define VCM_H264_IDX VCM_VP8_IDX + 1
+  #define VCM_H264_IDX (VCM_VP8_IDX + 1)
 #else
   #define VCM_H264_IDX VCM_VP8_IDX
 #endif
 #ifdef VIDEOCODEC_I420
-  #define VCM_I420_IDX VCM_H264_IDX + 1
+  #define VCM_I420_IDX (VCM_H264_IDX + 1)
 #else
   #define VCM_I420_IDX VCM_H264_IDX
 #endif
-#define VCM_NUM_VIDEO_CODECS_AVAILABLE VCM_I420_IDX + 1
+#define VCM_NUM_VIDEO_CODECS_AVAILABLE (VCM_I420_IDX + 1)
 
 #define VCM_NO_RECEIVER_ID 0