diff --git a/trunk/src/app/srs_app_rtc_queue.cpp b/trunk/src/app/srs_app_rtc_queue.cpp index 15999d510..ff820ab8b 100644 --- a/trunk/src/app/srs_app_rtc_queue.cpp +++ b/trunk/src/app/srs_app_rtc_queue.cpp @@ -248,7 +248,7 @@ void SrsRtpNackForReceiver::get_nack_seqs(vector& seqs) int alive_time = now - nack_info.generate_time_; if (alive_time > opts_.max_alive_time || nack_info.req_nack_count_ > opts_.max_count) { rtp_->notify_drop_seq(seq); - iter = queue_.erase(iter); + queue_.erase(iter++); continue; } diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp index 8af2f058e..ac04dc007 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp @@ -147,7 +147,7 @@ public: private: srs_error_t parse_extension(SrsBuffer* buf, const SrsRtpHeaderExtensionMap* extension_map); public: - virtual srs_error_t decode(SrsBuffer* buf, const SrsRtpHeaderExtensionMap* extmap = nullptr); + virtual srs_error_t decode(SrsBuffer* buf, const SrsRtpHeaderExtensionMap* extmap = NULL); virtual srs_error_t encode(SrsBuffer* buf); virtual int nb_bytes(); public: @@ -224,7 +224,7 @@ public: virtual int nb_bytes(); virtual srs_error_t encode(SrsBuffer* buf); // TODO: FIXME: Should follow interface ISrsEncoder. - virtual srs_error_t decode(SrsBuffer* buf, const SrsRtpHeaderExtensionMap* extmap = nullptr); + virtual srs_error_t decode(SrsBuffer* buf, const SrsRtpHeaderExtensionMap* extmap = NULL); }; // Single payload data.