Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

feature/async_write_file

feature/dynamic_codec

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

push_force_replace

#10

#1002

#1003

#1010

#1019

#1025

#1028

#1035

#104

#1040

#1041

#1052

#1053

#1059

#106

#1065

#1077

#1087

#1093

#1102

#1104

#1108

#1112

#1126

#1137

#1139

#1140

#1142

#1143

#115

#1154

#1156

#1158

#116

#1161

#1162

#1163

#1167

#1174

#1180

#1181

#1183

#1185

#1188

#1205

#1206

#1215

#1224

#1225

#1228

#1239

#124

#1262

#1273

#1274

#1275

#1278

#1281

#1286

#1287

#1289

#1292

#1293

#1317

#1320

#1322

#1323

#1324

#1330

#1336

#1341

#1346

#1349

#1361

#1362

#1364

#1368

#1369

#1372

#1386

#1391

#1401

#1404

#1405

#1409

#1411

#1419

#142

#1421

#1429

#1431

#1434

#1439

#1447

#1467

#1470

#1474

#1475

#1476

#1477

#1478

#1493

#15

#1505

#1508

#1518

#1525

#1528

#1536

#1537

#1539

#1541

#1542

#1543

#1545

#1551

#1552

#1553

#1554

#1571

#1572

#1574

#1578

#1582

#1584

#1595

#1607

#161

#1613

#1622

#1625

#1627

#1639

#1641

#1644

#1647

#1649

#1660

#1661

#1669

#167

#1676

#1677

#1678

#1682

#1695

#17

#1714

#1722

#1728

#1730

#1745

#1746

#1747

#1748

#1758

#1759

#1760

#1771

#1784

#1786

#1789

#1790

#1791

#1792

#1796

#18

#1803

#1805

#1809

#1814

#1822

#1825

#1829

#1835

#1836

#1837

#1841

#1842

#1846

#1851

#1852

#1853

#1854

#1856

#1858

#1871

#1880

#1893

#1894

#1906

#1908

#1920

#1929

#1930

#1931

#1936

#1937

#1938

#1940

#1942

#1945

#1947

#1948

#1950

#1952

#1958

#1959

#1966

#1969

#197

#1984

#199

#1992

#1993

#1994

#1999

#2032

#2048

#2061

#2063

#2075

#2092

#21

#2105

#2107

#2115

#2123

#2137

#215

#2166

#2183

#2187

#2190

#2223

#2232

#2233

#2234

#2246

#2258

#2259

#2266

#2270

#2272

#2279

#2293

#2297

#2301

#2302

#2303

#2305

#2322

#2323

#2327

#2332

#2340

#235

#2357

#2359

#2363

#2366

#2393

#2395

#2396

#2404

#2412

#2423

#2423

#2428

#2431

#2435

#2444

#2445

#2448

#2449

#2452

#2455

#2463

#2464

#2465

#2479

#2482

#2489

#2490

#2496

#2498

#2499

#2502

#2505

#2509

#2511

#2516

#2523

#2529

#2532

#2541

#2542

#2543

#2544

#2545

#2546

#2550

#2558

#2560

#2562

#2563

#2572

#2576

#2578

#2581

#2582

#2583

#2589

#2591

#2593

#2598

#2603

#2609

#2616

#262

#2620

#2627

#263

#2631

#2633

#2635

#2636

#2637

#2640

#2641

#2642

#2643

#2644

#2645

#2646

#265

#2659

#2659

#2660

#2664

#2674

#2676

#2677

#2678

#2680

#2688

#2689

#2690

#2691

#2692

#2693

#2694

#2701

#2708

#2710

#2712

#2713

#2714

#2715

#2716

#2717

#2718

#2719

#2721

#2722

#2723

#2739

#2740

#2741

#2742

#2743

#2751

#2757

#2758

#2759

#2760

#278

#2791

#2792

#2793

#2794

#2800

#2806

#2810

#2827

#285

#2858

#2859

#2884

#2885

#2894

#2895

#2895

#2896

#2898

#2899

#2900

#2910

#2915

#2924

#2928

#2933

#2935

#2936

#2941

#2951

#2954

#2958

#2958

#2959

#2960

#2963

#2966

#2967

#2970

#2974

#298

#2982

#2984

#2985

#2988

#2990

#2993

#2994

#2996

#3012

#3013

#3013

#3016

#3018

#3020

#3024

#3025

#3033

#3038

#3042

#3043

#3044

#3045

#3049

#3059

#3063

#3064

#3065

#3066

#3067

#3070

#3071

#3072

#3073

#3074

#3075

#3088

#3089

#3093

#3096

#3098

#3099

#3100

#3104

#3118

#3126

#3127

#3132

#3141

#3141

#3142

#3148

#3149

#3151

#3154

#3158

#3171

#3175

#3182

#3189

#3189

#3190

#3222

#3223

#3224

#3226

#3229

#3231

#3235

#3237

#3246

#3249

#3250

#3251

#3262

#3265

#3282

#3301

#3305

#3323

#3325

#3328

#3334

#3335

#3336

#3337

#334

#3342

#3352

#3353

#3355

#3356

#3359

#3360

#3361

#3362

#3363

#3367

#3368

#3371

#3373

#3380

#3381

#3385

#3392

#3392

#3397

#3406

#3407

#3409

#3411

#3412

#3419

#3419

#3429

#3432

#3433

#3442

#3444

#3446

#3468

#3469

#3476

#3499

#3500

#3508

#3510

#3520

#3527

#3538

#3540

#3548

#3549

#3552

#3561

#3562

#3567

#3584

#3587

#3588

#3590

#3593

#3596

#3601

#3601

#3602

#3603

#3603

#3606

#3607

#3611

#3612

#3618

#3619

#3620

#3622

#3628

#363

#3642

#3643

#3647

#3653

#3658

#3659

#3669

#3670

#3671

#3672

#3677

#3689

#3691

#3692

#3693

#3694

#3699

#3707

#3713

#3714

#3715

#3716

#3720

#3736

#374

#3740

#3747

#375

#3758

#3758

#3760

#3779

#3800

#3809

#3818

#382

#383

#3837

#3838

#3841

#3848

#3849

#3860

#3875

#3884

#3885

#3886

#3887

#3888

#3889

#3890

#3891

#3896

#3898

#3902

#3903

#3904

#3914

#3915

#3917

#3920

#3923

#3924

#3924

#3926

#3929

#3934

#3936

#3936

#3937

#3964

#3965

#3965

#397

#3980

#3985

#3986

#3986

#3990

#3991

#3992

#3996

#4

#4

#4003

#4008

#4018

#4019

#4028

#4029

#4031

#4032

#4033

#4034

#4035

#4039

#4042

#4043

#4048

#4048

#413

#425

#445

#457

#468

#471

#474

#478

#479

#509

#514

#57

#599

#60

#607

#61

#62

#633

#635

#643

#651

#654

#655

#656

#661

#662

#706

#74

#75

#758

#767

#80

#85

#865

#916

#918

#921

#927

#928

#932

#933

#935

#936

#94

#940

#941

#945

#953

#964

#966

#974

#984

#985

#986

#99

#990

#991

#992

#993

#994

Mono Color

• a9be01fbec 播放flv流时,非AAC与H264编码时,打印警告日志 xiongziliang 2021-01-09 19:03:02 +0800
• 97528c2583 更新ZLToolKit xiongziliang 2021-01-09 18:46:09 +0800
• 21102a4e49
  添加范例配置文件使用说明 夏楚 2021-01-09 18:04:43 +0800
• 48a1f6ea6c
  兼容rtp时间戳一直为0的流 夏楚 2021-01-09 17:53:21 +0800
• 0e3c21932d 修复编译失败的问题 xia-chu 2021-01-03 15:55:11 +0800
• 4b22e189d5 轮流发送rtcp与GET_PARAMETER保活:#642 xiongziliang 2021-01-02 22:32:13 +0800
• 9447ef70ca 添加作者 xiongziliang 2021-01-02 22:10:11 +0800
• 3ddc14d35d 合并pr(#661): 减少unsport code打印，新增git信息获取 monktan 2020-12-29 11:36:06 +0800
• d37607026f 修复编译警告 xiongziliang 2021-01-02 21:58:14 +0800
• 9715787060 bug fixed xiongziliang 2021-01-02 21:26:23 +0800
• 13221ad796 http回复根据状态码自动生成status message: #602 xiongziliang 2021-01-02 21:24:06 +0800
• c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 xiongziliang 2021-01-02 20:43:02 +0800
• 113430345c 更新api文档，getMediaList接口可以筛选stream:#669 xiongziliang 2021-01-02 20:18:43 +0800
• bca2b403ae getMediaList接口可以刷选stream:#669 xiongziliang 2021-01-02 20:12:33 +0800
• 122c853119 Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into open_src xiongziliang 2021-01-02 20:06:29 +0800
• bb5223e51a 不识别的rtp payload type按照ps处理:#673 xiongziliang 2021-01-02 20:02:38 +0800
• 6156805c97 Merge remote-tracking branch 'upstream/master' monktan 2020-12-29 14:43:12 +0800
• 30efc9f37f
  Merge pull request #662 from musicwood/patch-1 夏楚 2020-12-29 12:21:24 +0800
• 2cb2fa1510
  修复拉取rtsp流 SETUP 返回 454 Session Not Found 陈晓林 2020-12-29 12:16:35 +0800
• 47f2f5b349 减少unsport code打印，新增git信息获取 monktan 2020-12-29 11:36:06 +0800
• 871127d11a 合并主分支，解决冲突 monktan 2020-12-29 11:32:03 +0800
• f9f9cde2b4 整理webapi、webhook框架代码 xiongziliang 2020-12-27 22:14:59 +0800
• 781708f0a1 删除兼容代码 xiongziliang 2020-12-27 21:48:04 +0800
• 322ebdf4c1 GB28181 支持同时多路rtp推流 xiongziliang 2020-12-27 21:32:56 +0800
• 61b29efe94 统一代码风格 xiongziliang 2020-12-27 21:21:31 +0800
• 3a0fa27198 添加作者 xiongziliang 2020-12-27 21:14:46 +0800
• 4244cbf29e
  Merge pull request #656 from rmokerone/master 夏楚 2020-12-27 21:00:34 +0800
• 45e86a39cb
  Merge pull request #655 from chengxiaosheng/master 夏楚 2020-12-27 21:00:01 +0800
• 537ae2f412
  Merge pull request #651 from sunhui2013/master 夏楚 2020-12-27 20:56:33 +0800
• fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit ziyue 2020-12-27 18:41:53 +0800
• 2941068724 优化rtsp客户端代码 ziyue 2020-12-27 18:11:10 +0800
• 923768623a L16格式消除unknown codec提醒,添加只支持RTSP协议推流拉流提醒 Liu Jiang 2020-12-26 16:52:36 +0800
• d270a78089 getTrackType和getCodecName函数适配L16 Liu Jiang 2020-12-26 16:01:08 +0800
• 525949c362 将CodecL16放置到enum最后,防止兼容性问题 Liu Jiang 2020-12-26 16:00:35 +0800
• 66a3b7a9ca RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586) Liu Jiang 2020-12-26 15:08:01 +0800
• 40036ee92e centos7 docker 镜像支持 Kevin Cheng 2020-12-26 12:48:59 +0800
• 57836e3bbb 新增LABEL Kevin Cheng 2020-12-26 12:30:44 +0800
• 47e16ad0f4 优化脚本，缩小镜像大小 Kevin Cheng 2020-12-26 12:29:39 +0800
• cd99e723e2 fix rtsp enable rtmp mediasouce muxer mirs 2020-12-26 11:23:06 +0800
• cbc1f91904
  Update RtpServer.h sunny 2020-12-25 17:08:51 +0800
• c32c2146b2 添加停止、恢复rtp代理rtp超时检查功能 sunhui 2020-12-25 16:05:38 +0800
• 5a1ea5357f 添加docker-centos7支持 Kevin Cheng 2020-12-23 20:42:51 +0800
• 11fbe4c96b
  Merge pull request #4 from xia-chu/master 程憨憨 2020-12-23 20:32:04 +0800
• 4ea1fd8d76 优化tcp推流 monktan 2020-12-21 10:29:15 +0800
• bc125e65be addFFmpegSource接口支持enable_hls、enable_mp4参数 xiongziliang 2020-12-20 20:25:44 +0800
• 3cdc893856 更新功能图 xiongziliang 2020-12-19 20:38:39 +0800
• 29c9050787 更新推荐项目地址 xiongziliang 2020-12-19 20:31:35 +0800
• 584ea17dc5 删除不必要的日志 xiongziliang 2020-12-19 19:47:43 +0800
• 250d9f8e54 优化GB28181 tcp推流 xiongziliang 2020-12-19 19:46:18 +0800
• 76a55c6c08 修复笔误 xiongziliang 2020-12-19 18:59:22 +0800
• 544797e501 解决rtsp播放器TEARDOWN不传url的问题：#631 xiongziliang 2020-12-19 09:20:24 +0800
• 8efb2da572
  Update config.ini 夏楚 2020-12-19 09:16:04 +0800
• a60cf0b9a4
  Merge pull request #635 from mirsfang/master 夏楚 2020-12-19 09:14:48 +0800
• 1b2cb57ad8
  Merge pull request #633 from wasphin/feature/package-rpm 夏楚 2020-12-19 09:14:22 +0800
• 6c853008fc fix disable hls and rtpproxy compile error mirs 2020-12-18 18:32:12 +0800
• e467cf10c3 修正 rpm 包依赖配置 wxf 2020-12-18 09:12:52 +0800
• 6a2709bec2 需要 cmake3 wxf 2020-12-17 21:40:58 +0800
• 2242f7ecc5 修正 CentOS 6 下使用 devtoolset 8 编译问题 wxf 2020-12-17 20:43:38 +0800
• af6446507e 添加编译开关 wxf 2020-12-17 20:14:49 +0800
• acc5ecb937 添加 rpm spec wxf 2020-12-17 19:45:43 +0800
• 9a05c2be4d 调整 linux 下安装位置 wxf 2020-12-17 19:43:17 +0800
• 63867bc8c2 Merge remote-tracking branch 'upstream/master' monktan 2020-12-14 09:56:22 +0800
• 8b134d5b2d Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src xiongziliang 2020-12-13 09:56:26 +0800
• 1397399589 更新zltoolkit xiongziliang 2020-12-13 09:52:16 +0800
• f1c9b7b09c 修复播放器线程安全问题：#611 xiongziliang 2020-12-13 09:52:00 +0800
• b7d1a5059a 提高rtmp协议兼容性 xiongziliang 2020-12-13 09:51:08 +0800
• 937ae76e43 Merge remote-tracking branch 'upstream/master' monktan 2020-12-08 11:56:09 +0800
• 394c540bba Merge remote-tracking branch 'upstream/master' monktan 2020-12-07 11:40:22 +0800
• 8b2fb0bc1f 修复Linux下编译问题 ziyue 2020-12-06 22:36:44 +0800
• c0a4170086 优化http api相关代码,方便自由添加不同类型的api ziyue 2020-12-06 21:50:41 +0800
• dc3701e6cc 修复rtp存在ext时无法解析的bug:#585 ziyue 2020-12-06 21:08:16 +0800
• 43164d3670 Merge remote-tracking branch 'origin/master' ziyue 2020-12-07 10:24:28 +0800
• b90ebf6511 合并pr:#607 xiongziliang 2020-12-05 12:31:28 +0800
• 955ecde533
  Merge pull request #607 from alongL/master 夏楚 2020-12-05 12:29:20 +0800
• 3f37ef618d 删除文件太小的录像 xiongziliang 2020-12-05 12:25:52 +0800
• 55cf411c1e 支持bitrate xiongziliang 2020-12-05 12:22:17 +0800
• 68926b4ae7 支持bitrate ziyue 2020-12-04 16:44:53 +0800
• 7131649779
  Update HttpTSPlayer.cpp along 2020-12-03 10:23:46 +0800
• c9f698d374 merge upstream monktan 2020-11-30 10:07:06 +0800
• 575a231ba0 新增自定义rtmp command monktan 2020-11-30 10:00:26 +0800
• 42679cdf98 更新第三方库，提升GB28281推流兼容性 xiongziliang 2020-11-29 09:42:16 +0800
• a64ce68592 解决单Track时，等待时间太长的问题 xiongziliang 2020-11-29 09:38:04 +0800
• a5b4da7db5 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src xiongziliang 2020-11-29 09:36:12 +0800
• c4c978be44 去除编译警告 xiongziliang 2020-11-29 09:34:02 +0800
• e7569c8cbc 删除多余日志 xiongziliang 2020-11-29 09:33:49 +0800
• 5f01eb7f73
  Merge pull request #599 from sunhui2013/master 夏楚 2020-11-29 09:27:58 +0800
• 48788cf25b 解决RtpServer启动UDPServer收流造成崩溃问题 sunhui 2020-11-28 02:39:21 +0800
• 62130f77e6 !1 多路RTP 流输出 Merge pull request !1 from kingyuanyuan/branch kingyuanyuan 2020-11-27 17:26:52 +0800
• 50927548e9 增加多路RTP视频流输出 hewenyuan 2020-11-27 17:19:55 +0800
• 8e575c0c78 解决合并冲突 monktan 2020-11-24 14:49:21 +0800
• f7433b0f90 头文件中隐藏不必要的宏，避免宏蔓延：#554 xiongziliang 2020-11-21 22:39:32 +0800
• 408a678ade 修复编译问题：#584 xiongziliang 2020-11-21 22:32:01 +0800
• 751f42fe1e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into open_src xiongziliang 2020-11-21 22:17:36 +0800
• 9c585ce5a1 http客户端，host字段添加port，防止异常：#579 xiongziliang 2020-11-21 22:16:58 +0800
• f05422bb65 c api支持国标推流:#578 xiongziliang 2020-11-21 22:13:08 +0800
• c512c1a02e 关闭vhost时，m3u8中ts文件不指定vhost：#560 xiongziliang 2020-11-21 21:54:12 +0800
• 6e8d19704e Refactoring log monktan 2020-11-18 12:00:23 +0800
• ccd96f676c 重构变量名 monktan 2020-11-17 16:00:37 +0800
• 80ddf018d9 添加用户自定义serverid monktan 2020-11-17 14:59:39 +0800
• 634acdbdaf Merge remote-tracking branch 'upstream/master' monktan 2020-11-17 14:57:15 +0800