winlin

Merge branch 'wenjiegit-develop' into 2.0release

... ... @@ -731,6 +731,12 @@ int SrsHlsCache::write_audio(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t
}
}
// cache->audio will be free in flush_audio
// so we must check whether it's null ptr.
if (!cache->audio) {
return ret;
}
// TODO: config it.
// in ms, audio delay to flush the audios.
int64_t audio_delay = SRS_CONF_DEFAULT_AAC_DELAY;
... ...