external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'wenjiegit-develop' into 2.0release

Browse source
This commit is contained in:
winlin 2015-03-16 17:34:04 +08:00
commit 806b45e844
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_hls.cpp
View file

@ -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;