| Index: webrtc/common_types.h
 | 
| diff --git a/webrtc/common_types.h b/webrtc/common_types.h
 | 
| index 678b8566282ed97483d880e6d8ad911358023346..abbdf6c940e76433a596e95a9d7a3e0baca05221 100644
 | 
| --- a/webrtc/common_types.h
 | 
| +++ b/webrtc/common_types.h
 | 
| @@ -540,9 +540,18 @@ struct VideoCodecVP9 {
 | 
|  };
 | 
|  
 | 
|  // H264 specific.
 | 
| +enum H264PacketizationMode {
 | 
| +  // Because VideoCodecH264 was initialized in multiple places using memset,
 | 
| +  // we let 0 have the meaning of "not set".
 | 
| +  kH264PacketizationModeNotSet = 0,
 | 
| +  kH264PacketizationMode0,  // Only single NALU allowed
 | 
| +  kH264PacketizationMode1   // Non-interleaved - STAP-A, FU-A is allowed
 | 
| +};
 | 
| +
 | 
|  struct VideoCodecH264 {
 | 
|    bool frameDroppingOn;
 | 
|    int keyFrameInterval;
 | 
| +  H264PacketizationMode packetization_mode;
 | 
|    // These are NULL/0 if not externally negotiated.
 | 
|    const uint8_t* spsData;
 | 
|    size_t spsLen;
 | 
| 
 |