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 from 1.0release for bug #264. 2.0.74

Browse source
This commit is contained in:
winlin 2014-12-20 11:58:39 +08:00
commit eef8034632
6 changed files with 72 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1439,7 +1439,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* __audio)
sample->clear();
if ((ret = codec->audio_aac_demux(audio->payload, audio->size, sample)) != ERROR_SUCCESS) {
srs_error("codec demux audio failed. ret=%d", ret);
srs_error("hls codec demux audio failed. ret=%d", ret);
return ret;
}
@ -1484,7 +1484,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* __video)
sample->clear();
if ((ret = codec->video_avc_demux(video->payload, video->size, sample)) != ERROR_SUCCESS) {
srs_error("codec demux video failed. ret=%d", ret);
srs_error("hls codec demux video failed. ret=%d", ret);
return ret;
}