Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-03-26 20:06:54 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
9a61ddf6ed08d501b9d153d11b6ae76c879b9f65
9a61ddf6
1 parent
612c544d
fix hls aac adts bug, in aac mux. 1.0.31.
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
3 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_hls.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
9a61ddf
...
...
@@ -389,6 +389,7 @@ Supported operating systems and hardware:
## 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>
*
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.
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
9a61ddf
...
...
@@ -1192,7 +1192,7 @@ int SrsHlsCache::cache_audio(SrsAvcAacCodec* codec, SrsCodecSample* sample)
// 6.2 Audio Data Transport Stream, ADTS
// in aac-iso-13818-7.pdf, page 26.
// fixed 7bytes header
static
u_int8_t
adts_header
[
7
]
=
{
0xff
,
0xf
1
,
0x00
,
0x00
,
0x00
,
0x0f
,
0xfc
};
static
u_int8_t
adts_header
[
7
]
=
{
0xff
,
0xf
9
,
0x00
,
0x00
,
0x00
,
0x0f
,
0xfc
};
/*
// adts_fixed_header
// 2B, 16bits
...
...
trunk/src/core/srs_core.hpp
查看文件 @
9a61ddf
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 3
0
#define VERSION_REVISION 3
1
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论