diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h
index dadc35c69d..9ee6be222c 100644
--- a/test/video_codec_settings.h
+++ b/test/video_codec_settings.h
@@ -48,29 +48,25 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) {
       kTestTimingFramesDelayMs, kTestOutlierFrameSizePercent,
   };
 
+  settings->codecType = codec_type;
   switch (codec_type) {
     case kVideoCodecVP8:
-      settings->codecType = kVideoCodecVP8;
       *(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings();
       return;
     case kVideoCodecVP9:
-      settings->codecType = kVideoCodecVP9;
       *(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings();
       return;
     case kVideoCodecH264:
-      settings->codecType = kVideoCodecH264;
       // TODO(brandtr): Set |qpMax| here, when the OpenH264 wrapper supports it.
       *(settings->H264()) = VideoEncoder::GetDefaultH264Settings();
       return;
     case kVideoCodecI420:
-      settings->codecType = kVideoCodecI420;
       // Bitrate needed for this size and framerate.
       settings->startBitrate =
           3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2;
       settings->maxBitrate = settings->startBitrate;
       return;
     default:
-      RTC_NOTREACHED();
       return;
   }
 }