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

fix hls aac adts bug, in aac mux. 1.0.31.

Browse source
This commit is contained in:
winlin 2015-03-26 20:06:54 +08:00
parent 612c544d70
commit 9a61ddf6ed
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -389,6 +389,7 @@ Supported operating systems and hardware:
## History ## History
* v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31.
* <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r3) released. 59511 lines.</strong> * <strong>v1.0, 2015-03-19, [1.0r3 release(1.0.30)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r3) released. 59511 lines.</strong>
* v1.0, 2015-03-17, remove the osx for 1.0.30. * v1.0, 2015-03-17, remove the osx for 1.0.30.
* v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. * v1.0, 2015-02-17, the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.

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

@ -1192,7 +1192,7 @@ int SrsHlsCache::cache_audio(SrsAvcAacCodec* codec, SrsCodecSample* sample)
// 6.2 Audio Data Transport Stream, ADTS // 6.2 Audio Data Transport Stream, ADTS
// in aac-iso-13818-7.pdf, page 26. // in aac-iso-13818-7.pdf, page 26.
// fixed 7bytes header // fixed 7bytes header
static u_int8_t adts_header[7] = {0xff, 0xf1, 0x00, 0x00, 0x00, 0x0f, 0xfc}; static u_int8_t adts_header[7] = {0xff, 0xf9, 0x00, 0x00, 0x00, 0x0f, 0xfc};
/* /*
// adts_fixed_header // adts_fixed_header
// 2B, 16bits // 2B, 16bits

2
trunk/src/core/srs_core.hpp
View file

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 30 #define VERSION_REVISION 31
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"