Index: webrtc/modules/audio_coding/neteq/payload_splitter.cc |
diff --git a/webrtc/modules/audio_coding/neteq/payload_splitter.cc b/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
index 8530718134160341fff8519042f7b35f87d28fc5..542863970b31b216a563f388600eaad2b2a34f54 100644 |
--- a/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
+++ b/webrtc/modules/audio_coding/neteq/payload_splitter.cc |
@@ -143,8 +143,9 @@ int PayloadSplitter::SplitFec(PacketList* packet_list, |
// Not an FEC packet. |
AudioDecoder* decoder = decoder_database->GetDecoder(payload_type); |
- // decoder should not return NULL. |
- assert(decoder != NULL); |
+ // decoder should not return NULL, except for comfort noise payloads which |
+ // are handled separately. |
+ assert(decoder != NULL || decoder_database->IsComfortNoise(payload_type)); |
if (!decoder || |
!decoder->PacketHasFec(packet->payload, packet->payload_length)) { |
++it; |