胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
8c96472c 2 parents 59f5c5d6 50a7b9c1

merge srs2

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 5 行删除
@@ -1267,7 +1267,6 @@ Winlin @@ -1267,7 +1267,6 @@ Winlin
1267 [bug #59]: https://github.com/simple-rtmp-server/srs/issues/59 1267 [bug #59]: https://github.com/simple-rtmp-server/srs/issues/59
1268 [bug #50]: https://github.com/simple-rtmp-server/srs/issues/50 1268 [bug #50]: https://github.com/simple-rtmp-server/srs/issues/50
1269 [bug #34]: https://github.com/simple-rtmp-server/srs/issues/34 1269 [bug #34]: https://github.com/simple-rtmp-server/srs/issues/34
1270 -<<<<<<< HEAD  
1271 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367 1270 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
1272 [bug #319]: https://github.com/simple-rtmp-server/srs/issues/319 1271 [bug #319]: https://github.com/simple-rtmp-server/srs/issues/319
1273 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367 1272 [bug #367]: https://github.com/simple-rtmp-server/srs/issues/367
@@ -1284,11 +1283,10 @@ Winlin @@ -1284,11 +1283,10 @@ Winlin
1284 [bug #468]: https://github.com/simple-rtmp-server/srs/issues/468 1283 [bug #468]: https://github.com/simple-rtmp-server/srs/issues/468
1285 [bug #502]: https://github.com/simple-rtmp-server/srs/issues/502 1284 [bug #502]: https://github.com/simple-rtmp-server/srs/issues/502
1286 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467 1285 [bug #467]: https://github.com/simple-rtmp-server/srs/issues/467
1287 -[bug #xxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxx  
1288 -=======  
1289 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512 1286 [bug #512]: https://github.com/simple-rtmp-server/srs/issues/512
1290 [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx 1287 [bug #xxxxxxxxxx]: https://github.com/simple-rtmp-server/srs/issues/xxxxxxxxxx
1291 ->>>>>>> 2.0release 1288 +
  1289 +[exo #828]: https://github.com/google/ExoPlayer/pull/828
1292 1290
1293 [r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2 1291 [r2.0a2]: https://github.com/simple-rtmp-server/srs/releases/tag/v2.0-a2
1294 [r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1 1292 [r2.0a1]: https://github.com/simple-rtmp-server/srs/releases/tag/2.0a1
@@ -381,7 +381,7 @@ int SrsFlvEncoder::write_header() @@ -381,7 +381,7 @@ int SrsFlvEncoder::write_header()
381 char flv_header[] = { 381 char flv_header[] = {
382 'F', 'L', 'V', // Signatures "FLV" 382 'F', 'L', 'V', // Signatures "FLV"
383 (char)0x01, // File version (for example, 0x01 for FLV version 1) 383 (char)0x01, // File version (for example, 0x01 for FLV version 1)
384 - (char)0x00, // 4, audio; 1, video; 5 audio+video. 384 + (char)0x05, // 4, audio; 1, video; 5 audio+video.
385 (char)0x00, (char)0x00, (char)0x00, (char)0x09 // DataOffset UI32 The length of this header in bytes 385 (char)0x00, (char)0x00, (char)0x00, (char)0x09 // DataOffset UI32 The length of this header in bytes
386 }; 386 };
387 387