Commit Graph

Select branches

Hide Pull Requests

1.0

2.0

3.0

4.0

5.0

6.0

7.0

8.0

codex/fix-cookie-authentication-csrf-vulnerability

codex/fix-unbounded-memory-growth-in-mjpeg-rtp-decoding

copilot/reliable-udp-projects

feature/async_write_file

feature/dynamic_library

feature/hls_record_disk

feature/log_context

feature/transcode

feature/transcode2

master

seek_with_neg

#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

#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

#3397

#3406

#3407

#3409

#3411

#3412

#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

#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

#3926

#3929

#3934

#3936

#3937

#3964

#3965

#397

#3980

#3985

#3986

#3990

#3991

#3992

#3996

#4

#4

#4003

#4008

#4018

#4019

#4028

#4029

#4031

#4032

#4033

#4034

#4035

#4039

#4042

#4043

#4048

#4050

#4055

#4059

#4069

#4073

#4085

#4088

#4092

#4093

#4100

#4101

#4102

#4106

#4113

#4114

#4128

#4129

#413

#4132

#4143

#4149

#4153

#4154

#4157

#4171

#4172

#4176

#4188

#4191

#4195

#4206

#4212

#4213

#4219

#4226

#4233

#4238

#4239

#4249

#425

#4257

#4262

#4282

#4291

#4295

#4307

#4308

#4315

#4320

#4321

#4328

#4332

#4334

#4340

#4343

#4346

#4347

#4359

#4364

#4369

#4372

#4374

#4379

#4382

#4384

#4386

#4387

#4389

#4390

#4401

#4402

#4421

#4424

#4427

#4436

#4442

#4445

#445

#4469

#4471

#4473

#4475

#4478

#4479

#4481

#4482

#4484

#4488

#4498

#4501

#4505

#4521

#4533

#4548

#4558

#4561

#4563

#4564

#4567

#457

#4570

#4571

#4576

#4579

#4582

#4582

#4586

#4587

#4598

#4609

#4613

#4617

#4620

#4622

#4631

#4632

#4633

#4646

#4654

#4664

#4664

#4667

#4671

#4677

#4678

#468

#4689

#4690

#4691

#4699

#4701

#4701

#4703

#4705

#471

#4710

#4720

#4727

#474

#4742

#4745

#4746

#4761

#4762

#4763

#4763

#4764

#4767

#4767

#4768

#4768

#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

• 6596eec069 Merge branch 'rtc_audio_delay' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-28 10:21:48 +08:00
• ff2e4cf152 添加ffmpeg相关cmake文件 xiongziliang 2022-05-28 10:18:40 +08:00
• a11289e5f0 集群模式，溯源重试改成最大3次: #1663 xiongziliang 2022-05-28 09:52:31 +08:00
• 0c5b3f87e5 优化cmake xiongziliang 2022-05-28 09:48:19 +08:00
• 93201f40d3 优化日志提示 xiongziliang 2022-05-28 09:47:48 +08:00
• 4e57416be9 修复cmake generate export 和 test工程先后变编译错误问题 baiyfcu 2022-05-27 17:03:49 +08:00
• 3110284302 修复rtc单独播放音频延时高问题 cqm 2022-05-27 09:24:11 +08:00
• e2908e9775 cmake构建时自动生成mk_export头文件,解决msvc链接设备问题 (#1660) 夏楚 2022-05-26 20:30:43 +08:00
• 989e7b2e75 解决msvc下编译问题 ziyue 2022-05-26 11:59:19 +08:00
• 59ff0a9a1a 添加utf-8 bom头，解决msvc下编译问题 ziyue 2022-05-26 11:00:48 +08:00
• d79178d116 解决msvc下编译问题 ziyue 2022-05-26 10:49:44 +08:00
• 5f3a46d611 FFmpeg未找到时，忽略player_opencv用例 ziyue 2022-05-25 16:06:30 +08:00
• cb0e5c6c57 全面更新整理c sdk ziyue 2022-05-25 15:38:32 +08:00
• 9736badcea 优化编解码相关代码 ziyue 2022-05-25 15:11:26 +08:00
• 0739b1ddd2 完成FFmpeg相关代码迁移改造 ziyue 2022-05-25 14:50:26 +08:00
• fa70af7cce 移动FFmpeg相关代码 ziyue 2022-05-25 14:41:08 +08:00
• 6f8ff98afd 更新zltoolkit，并更新作者列表 xiongziliang 2022-05-21 19:55:21 +08:00
• d78657b706 检查sendmmsg相关依赖并设置对应的宏 zhaoyi233 2022-05-21 15:18:51 +08:00
• b0f0bdb6ae 调整优化webrtc sdp处理相关代码 xiongziliang 2022-05-20 22:14:21 +08:00
• 757001ad8a Merge branch 'sdp_munging' of github.com:mtdxc/ZLMediaKit xiongziliang 2022-05-20 21:58:58 +08:00
• 30dbac2c70 提高对不规范GB28181流的兼容性，防止视频轨道被忽略 xiongziliang 2022-05-20 21:52:53 +08:00
• 557d70eac5 更新ZLToolKit，修复可能缓存多个gop的bug xiongziliang 2022-05-20 21:52:01 +08:00
• b61cce85bd 修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644) xiongguangjie 2022-05-19 19:01:23 +08:00
• c7d7999f53 兼容gcc4.8编译器 ziyue 2022-05-18 20:07:54 +08:00
• 2b29e58f71 sdp代码重构, 增加addItem和addAttr cqm 2022-05-18 09:56:53 +08:00
• 6cab65f7b0 支持SDP munging方式simulicast (#1639) mtdxc 2022-05-18 11:26:57 +08:00
• 9d9315d8c6 支持SDP munging方式simulicast cqm 2022-05-16 12:54:50 +08:00
• ee15c571e0 更新zltoolkit，修复环形缓冲相关bug ziyue 2022-05-17 20:06:36 +08:00
• e1d4417062 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-15 18:02:14 +08:00
• d9f552ded9 更新zltoolkit ziyue 2022-05-15 18:01:25 +08:00
• 251fe1f77c 优化随机端口分配逻辑 xiongziliang 2022-05-14 23:34:33 +08:00
• 8231c5c293 新增GB28181 tcp passive被动发送接口(startSendRtpPassive) xiongziliang 2022-05-14 23:25:22 +08:00
• 4f768cacf1 修复编译警告 xiongziliang 2022-05-14 18:46:50 +08:00
• b4166d5cfe 修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635 xiongziliang 2022-05-14 17:14:38 +08:00
• f1555a5501 防止忽略shutdown事件 xiongziliang 2022-05-13 23:54:04 +08:00
• 3e869c1f1d 修复https 302 跳转http相关bug xiongziliang 2022-05-13 23:24:17 +08:00
• dd8b4783b7 Merge remote-tracking branch 'origin/master' xiongziliang 2022-05-13 23:22:10 +08:00
• fdbfccb32e hls/http-ts播放器在消费完frame时再触发shutdown事件 xiongziliang 2022-05-13 23:22:00 +08:00
• ed13cc691c 新增metaRTC链接 夏楚 2022-05-13 22:52:30 +08:00
• d8b99101cf 更新ZLToolKit xiongziliang 2022-05-13 20:48:34 +08:00
• 9e6ff0e798 优化头文件引用: #1627 xiongziliang 2022-05-13 20:48:22 +08:00
• b0f15c9647 sctp关闭编译时,关闭datachannel相关功能 xiongziliang 2022-05-13 20:45:04 +08:00
• 3dd3897ad6 新增部分作者 xiongziliang 2022-05-13 20:22:19 +08:00
• 7e58d91a57 修复rtp two byte ext解析相关bug: #1631 xiongziliang 2022-05-13 20:01:57 +08:00
• 301cbf0a83 支持多个rtc候选地址 (#1622) mtdxc 2022-05-12 15:21:09 +08:00
• 943deab664 解决CentOS7下Parse.cpp编译不通过问题 (#1627) starry 2022-05-12 15:12:13 +08:00
• 845b2ea8d8 !16 增加长期保存hls切片的功能 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 夏楚 2022-05-11 03:39:59 +00:00
• 5bc313bafe 增加长期保存hls切片的功能，segKeep=0为不长期保存，segKeep=1为长期保存。此功能部分等效于segNum=0的情况，不同的是这个保留不会在m3u8文件中体现。 WuPeng 2022-05-10 17:32:50 +08:00
• 4c1f0c9b7f 修复Windows下绑定端口可能失败的问题 ziyue 2022-05-10 17:28:48 +08:00
• 5b51d7cb93 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-05-10 16:49:42 +08:00
• 3c72917ea0 修复bind socket在Windows下失败导致的问题 ziyue 2022-05-10 16:49:08 +08:00
• a9d7874467 Update README.md 夏楚 2022-05-10 15:31:36 +08:00
• 9861091b18 优先使用ipv4地址 ziyue 2022-05-10 14:48:05 +08:00
• 45494c020b bug fixed ziyue 2022-05-10 10:44:12 +08:00
• d037acbf62 完善ipv6支持 ziyue 2022-05-08 17:06:10 +08:00
• a44334acaf 全面支持ipv6 ziyue 2022-05-08 16:33:33 +08:00
• a95bf960e0 完善ipv6支持 xiongziliang 2022-05-08 09:25:47 +08:00
• c14bf7d8b1 修复编译问题 xiongziliang 2022-05-08 00:39:52 +08:00
• d66845425c 完善ipv6网络适配 xiongziliang 2022-05-08 00:26:01 +08:00
• 3062ea0e7c 初步支持ipv6: #576, #1406 ziyue 2022-05-07 20:06:08 +08:00
• 5e08e43e9a webrtc测试网页新增datachannel echo显示框 (#1613) Dw9 2022-05-05 16:34:49 +08:00
• 5844b61880 Merge pull request #1607 from Dw9/master Xiaofeng Wang 2022-05-05 09:38:44 +08:00
• fb003714e9 新增webrtc datachannel功能: #1216 xiongziliang 2022-05-04 22:15:21 +08:00
• d507b76097 Update CMakeLists.txt Dw9 2022-05-01 12:19:23 +08:00
• 200a193c04 openRtpServer新增ssrc参数修改为追加至函数末尾, 确保代码逻辑一致无歧义: #1572 ziyue 2022-04-28 17:44:35 +08:00
• 85399015f9 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-04-28 17:26:05 +08:00
• c1d2adebae rtmp拉流的兼容性改进 (#1595) alexliyu7352 2022-04-28 14:13:09 +08:00
• 5e729d6153 溯源集群模式支持边沿服务器选择开启转hls: #1588 xiongziliang 2022-04-23 18:40:20 +08:00
• c31d44d680 Merge pull request #1584 from Dw9/master 夏楚 2022-04-19 19:45:01 +08:00
• 56e72b1191 ci支持pull request 夏楚 2022-04-19 19:31:22 +08:00
• d06b4cdd3a ci支持pull request 夏楚 2022-04-19 19:30:55 +08:00
• 824f1d2a47 ci支持pull request 夏楚 2022-04-19 19:30:14 +08:00
• 67bb53746e Update CMakeLists.txt Dw9 2022-04-19 18:07:03 +08:00
• c82cc587c8 fix typo (#1578) Dw9 2022-04-18 11:48:56 +08:00
• 97952bdf0f 更新第三方库，修复mp4录制相关问题：1507 xiongziliang 2022-04-16 22:23:26 +08:00
• 974055fd17 确保推流器主动断开时，不开启断连续推特性: #1559 xiongziliang 2022-04-16 21:37:07 +08:00
• ebe4141026 c api和测试范例新增webrtc功能 (#1574) Dw9 2022-04-16 15:57:02 +08:00
• e712639e33 openrtpserver接口新增ssrc参数，强制过滤不属于本端口的视频流，以解决视频串流问题 (#1572) wangcker 2022-04-16 15:12:49 +08:00
• 2b460c97ed 更新第三方库 xiongziliang 2022-04-16 14:38:38 +08:00
• 24472ee346 修复aac adts头大于7个字节时的兼容性问题 xiongziliang 2022-04-16 14:13:55 +08:00
• 5144b84ee7 添加bom头 ziyue 2022-04-10 23:58:56 +08:00
• f128b35b18 解决多pps问题 alexliyu7352 2022-04-10 23:43:44 +08:00
• 08de795220 Update H264.h alexliyu7352 2022-04-10 23:38:42 +08:00
• a0c1bc13cc 修复多次调用onShutdown的bug (#1552) alexliyu7352 2022-04-10 19:09:16 +08:00
• e065b1dfba 子进程重启失败时，不应通知守护进程退出，确保子进程重启成功 xiongziliang 2022-04-09 21:02:54 +08:00
• c334dcfd38 Revert "子进程重启失败时，不断重试，避免重启失败 (#1545)" xiongziliang 2022-04-09 20:57:00 +08:00
• 471a8b7735 子进程重启失败时，不断重试，避免重启失败 (#1545) alexliyu7352 2022-04-09 20:37:36 +08:00
• a1b350c9f0 startSendRtp接口udp发送不指定端口时，从端口池获取端口 xiongziliang 2022-04-09 10:33:27 +08:00
• a6e82799f5 openRtpServer接口新增re_use_port参数 xiongziliang 2022-04-09 10:26:15 +08:00
• 6073175e75 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-09 10:23:33 +08:00
• 78d32702e2 修复由于识别不出关键帧而导致hls不能切片. (#1551) alexliyu7352 2022-04-09 10:22:41 +08:00
• 6c0fea4c46 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit xiongziliang 2022-04-07 20:39:34 +08:00
• 75b17b3a6a 避免m3u8文件为chunked时崩溃 (#1543) alexliyu7352 2022-04-06 14:16:48 +08:00
• e4262222f4 hls拉流时应该适当重试 (#1541) alexliyu7352 2022-04-05 19:49:22 +08:00
• efc3e78ba0 使用emplace_back优化代码 (#1542) alexliyu7352 2022-04-05 19:32:02 +08:00
• 8da23da35c 添加utf-8 bom头 xiongziliang 2022-04-03 18:38:07 +08:00
• 2818e371b8 完善startSendRtp接口 xiongziliang 2022-04-03 18:25:36 +08:00
• de0738b1d1 Merge branch 'feature/rawrtpsend' of github.com:ZLMediaKit/ZLMediaKit xiongziliang 2022-04-03 17:34:51 +08:00
• 7ed8429759 Merge pull request #1537 from alexliyu7352/alexliyu7352-patch-19 夏楚 2022-04-03 17:33:38 +08:00
• 007164ac9b 崩溃重启时间改成3秒 (#1536) alexliyu7352 2022-04-03 17:32:38 +08:00