diff --git a/webrtc/test/encoder_settings.cc b/webrtc/test/encoder_settings.cc
index 5193be6..9842d1e 100644
--- a/webrtc/test/encoder_settings.cc
+++ b/webrtc/test/encoder_settings.cc
@@ -59,9 +59,13 @@
 
   codec.plType = encoder_settings.payload_type;
   strcpy(codec.plName, encoder_settings.payload_name.c_str());
-  codec.codecType =
-      (encoder_settings.payload_name == "VP8" ? kVideoCodecVP8
-                                              : kVideoCodecGeneric);
+  if (encoder_settings.payload_name == "VP8") {
+    codec.codecType = kVideoCodecVP8;
+  } else if (encoder_settings.payload_name == "H264") {
+    codec.codecType = kVideoCodecH264;
+  } else {
+    codec.codecType = kVideoCodecGeneric;
+  }
 
   if (codec.codecType == kVideoCodecVP8) {
     codec.codecSpecific.VP8.resilience = kResilientStream;
@@ -73,6 +77,12 @@
     codec.codecSpecific.VP8.keyFrameInterval = 3000;
   }
 
+  if (codec.codecType == kVideoCodecH264) {
+    codec.codecSpecific.H264.profile = kProfileBase;
+    codec.codecSpecific.H264.frameDroppingOn = true;
+    codec.codecSpecific.H264.keyFrameInterval = 3000;
+  }
+
   codec.width = 320;
   codec.height = 180;
   codec.startBitrate = codec.minBitrate = codec.maxBitrate = 300;