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

• 6fad6f591f 开启第三方mpeg库编译宏开关，兼容某些国标流 ziyue 2022-09-20 16:00:13 +08:00
• b35d41b4b7 Merge pull request #1969 from wasphin/feature/fix-link-flags Xiaofeng Wang 2022-09-20 11:05:57 +08:00
• ec1942fa81 srt connection transfer support xiongguangjie 2022-09-20 00:39:42 +08:00
• 0c882d4d79 cmake: fix include directory for assert.h Xiaofeng Wang 2022-09-19 21:15:20 +08:00
• 11dfcf3bdb cmake: -Wl linking flags Xiaofeng Wang 2022-09-19 21:02:51 +08:00
• c282775205 cmake: fix linking asan Xiaofeng Wang 2022-09-19 21:00:48 +08:00
• b77c19c969 更新ssl证书 ziyue 2022-09-18 21:13:01 +08:00
• 0b355759de 整理webrtc相关代码命名空间 ziyue 2022-09-18 21:03:05 +08:00
• 15affeff1d 优化关闭媒体源相关逻辑: #1963 ziyue 2022-09-18 20:36:47 +08:00
• daafe62f35 更新功能一览图 xiongziliang 2022-09-17 23:27:42 +08:00
• 99b8be9051 更新第三方库，兼容大华某些设备国标流 xiongziliang 2022-09-17 09:58:52 +08:00
• 12551be33c 提炼ProtocolOption赋值相关逻辑 xiongziliang 2022-09-16 23:30:55 +08:00
• c094751f17 Merge pull request #1958 from amani-lei/patch-1 老衲不出家 2022-09-14 11:06:04 +08:00
• c552d8c1bf 使用docker buildx, 用于支持跨平台build He Lei 2022-09-14 10:08:18 +08:00
• 08789454c3 rtsp支持指定播放单一track (#1937) custompal 2022-09-13 16:27:00 +08:00
• d04a6d4355 rtc receive sr reset alive ticker xiongguangjie 2022-09-09 23:04:28 +08:00
• 098bd319ab Android ci fixed (#1952) 夏楚 2022-09-09 18:06:18 +08:00
• 4a35ddbddb Merge pull request #1942 from mtdxc/reduce_code 夏楚 2022-09-09 11:10:55 +08:00
• 97320a264d 修复c sdk获取视频帧flags信息不对的问题 (#1947) Mr. shengge 2022-09-09 11:05:42 +08:00
• d853075175 RtpServer新增tcp主动模式支持 (#1938) custompal 2022-09-09 10:56:28 +08:00
• 258a4dd166 C API和WebHook未找到流回调添加直接关闭机制 (#1948) huangxiuqi 2022-09-09 10:55:35 +08:00
• 7f86299c80 rtc stop push unregister mediasource xiongguangjie 2022-09-07 19:10:06 +08:00
• 6ca736f88a Merge pull request #1940 from AlphaWu/master 夏楚 2022-09-07 15:09:24 +08:00
• 96c19ac85f 修复webrtcsession getIdentifier 为空的bug,导致GetAllSession webrtcsession的id 为空 xiongguangjie 2022-09-07 13:58:26 +08:00
• 999e0b274e 简化代码: - MediaSource引入shortUrl和getUrl来简化日志输出 - WebApi引入fillSockInfo cqm 2022-09-07 11:06:39 +08:00
• f765e5365b 修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。 WuPeng 2022-09-06 21:13:11 +08:00
• 4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 ziyue 2022-09-05 14:59:46 +08:00
• 00c9749b5d 防止多个track时获取rtp推流丢包率失败 xiongziliang 2022-09-03 16:47:37 +08:00
• 5825f8b469 修复错误注释 xiongziliang 2022-09-03 16:31:43 +08:00
• 06c6654ed5 精简代码 xiongziliang 2022-09-03 16:27:30 +08:00
• c8ea6490cd 修复直接拉流代理时同协议流无法注册的问题 xiongziliang 2022-09-03 16:07:53 +08:00
• 20f1275c58 rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877 xiongziliang 2022-09-03 15:53:01 +08:00
• cd269672a5 新增作者 xiongziliang 2022-09-03 14:55:46 +08:00
• 0948a3df31 支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) PioLing 2022-09-03 09:54:09 +08:00
• aa6581c253 Merge pull request #1931 from custompal/cus_pr 夏楚 2022-09-02 18:10:11 +08:00
• dd6495cc07 补充getMediaPlayerList接口注释及postman示例 custompal 2022-09-02 17:46:09 +08:00
• feaacf39ec Merge pull request #1920 from custompal/cus_pr 夏楚 2022-09-02 17:30:50 +08:00
• 48d49a334d Update README.md 夏楚 2022-09-02 11:46:38 +08:00
• 33e1e6b88d getMediaPlayerList返回播放器id以及会话类型名称 custompal 2022-09-01 21:52:43 +08:00
• d0214a13e1 防止getPlayerList返回的json数据为null custompal 2022-09-01 17:45:06 +08:00
• 38170c702e 修正gcc4.8编译错误 custompal 2022-09-01 17:33:36 +08:00
• 640ed13d67 更新ZLToolKit custompal 2022-09-01 17:03:16 +08:00
• ce545aa74f Merge branch 'master' into cus_pr custompal 2022-09-01 16:56:44 +08:00
• 3585e9f7bc 增加VLC如何播放SRT协议说明 (#1929) KevinZang 2022-09-01 15:53:19 +08:00
• 0d6509ce03 统一部分变量名和代码样式风格 custompal 2022-08-30 21:24:25 +08:00
• 04aa3ef41f 增加获取媒体流播放器列表功能 custompal 2022-08-30 21:05:19 +08:00
• 679c79802f 整理媒体事件相关代码，删除无须重载时的多余代码逻辑 xiongzilaing 2022-08-28 17:25:56 +08:00
• 67ad2a49c3 srt is player stop handleshake timert xiongguangjie 2022-08-27 15:18:32 +08:00
• f9f6fd136a srt handle packet send repeate by timer xiongguangjie 2022-08-27 15:06:03 +08:00
• 602c8e068b srt handshake packet send 3 times xiongguangjie 2022-08-27 13:25:23 +08:00
• beb6383e72 optimize srt handle shake xiongguangjie 2022-08-27 12:46:35 +08:00
• f0ae5a1bd7 优化日志提示 xiongziliang 2022-08-27 11:00:24 +08:00
• 0cab9c8d16 rtp发送去除重连机制 xiongziliang 2022-08-27 10:59:15 +08:00
• 6a4297845f 新增发送rtp被动关闭hook xiongziliang 2022-08-27 10:53:47 +08:00
• c2ab45f78d 完善线程安全设计 xiongziliang 2022-08-27 10:17:06 +08:00
• 8b0bd2d224 Merge pull request #1908 from aaasoft/master 夏楚 2022-08-26 11:43:03 +08:00
• 00acea369e 修复接收rtsp、gb28181等rtp流转为其他协议播放时可能卡顿的bug (#1906) rqb500 2022-08-26 11:42:40 +08:00
• 69416f53c9 更新.gitignore文件，排除out目录。 张鹏 2022-08-26 10:37:47 +08:00
• 44ba971cb6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit ziyue 2022-08-23 14:13:36 +08:00
• 208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 ziyue 2022-08-23 14:11:32 +08:00
• 074d13be0c rpm: 默认不打包 api/cxx-api Xiaofeng Wang 2022-08-22 13:18:05 +08:00
• a06b4321be cmake: fix install cxx api headers Xiaofeng Wang 2022-08-22 13:11:17 +08:00
• c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 xiongziliang 2022-08-20 13:16:25 +08:00
• 9f0c15a4f0 startSendRtp接口支持rtcp接收超时主动停止 xiongziliang 2022-08-20 12:48:27 +08:00
• b7ef766701 支持单独的datachannel通道 (#1894) Dw9 2022-08-20 10:28:19 +08:00
• 39d2255771 Merge pull request #1893 from gongluck/master 夏楚 2022-08-19 10:22:34 +08:00
• 0764e48f6c 兼容安卓平台，to_string模板处理pt值 gongluck 2022-08-18 19:13:22 +08:00
• 30984d2076 mp4录制支持作为观看者参与播放人数统计 (#1880) Dw9 2022-08-16 11:47:24 +08:00
• c19fa29e75 更新zltoolkit，修复绑定ipv6地址可能失败的问题 ziyue 2022-08-15 11:59:09 +08:00
• a1000da71f add get version restful api xiongguangjie 2022-08-12 18:09:44 +08:00
• 6382fcb3be 确保on_publish事件回调时线程安全 ziyue 2022-08-11 18:36:17 +08:00
• 4e8c56e2be 使用wepoll iocp模拟epoll api,实现在windows下支持iocp (#1871) 紫耀风 2022-08-11 10:18:16 +08:00
• b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 ziyue 2022-08-10 10:44:34 +08:00
• 795b4dbbd3 修复http文件服务器对特殊字符文件不兼容的bug:#1866 ziyue 2022-08-10 10:37:49 +08:00
• 099845b329 FMP4Packet时间戳类型改成64位 ziyue 2022-08-08 17:57:29 +08:00
• 35791aac89 优化代码，去除编译警告，修复拼写错误 ziyue 2022-08-08 17:36:07 +08:00
• 9c3b8a6a95 时间戳改为64位 ziyue 2022-08-08 17:13:39 +08:00
• 143580d780 修复编译警告 ziyue 2022-08-08 15:28:43 +08:00
• b42a9e8e84 新增作者 ziyue 2022-08-05 18:11:46 +08:00
• 663d167837 格式化代码 ziyue 2022-08-05 17:55:48 +08:00
• ba947cb6b5 调整switch case语句缩进 ziyue 2022-08-05 17:42:17 +08:00
• f85de2e108 精简复用rtp encoder创建相关代码 ziyue 2022-08-05 17:36:51 +08:00
• d3ac296228 调整switch case代码风格 ziyue 2022-08-05 17:23:46 +08:00
• fe3f9e3cff 更新zltoolkit ziyue 2022-08-05 16:01:43 +08:00
• 7458a67c66 修正deleteRecordDirectory接口拼写错误并精简代码 ziyue 2022-08-05 16:01:31 +08:00
• 024c3e1a28 Merge pull request #1856 from Dw9/master Dw9 2022-08-04 22:29:34 +08:00
• 73d2cd4ff7 修复pr1885 删除文件判断逻辑错误 Dw9 2022-08-04 22:00:44 +08:00
• db70aec690 增加webapi deleteRecordDirectroy(删除录像文件夹) (#1851) dreamisdream 2022-08-04 10:15:07 +08:00
• 1491770dba 生成的文件放到当前模块的目录下 Xiaofeng Wang 2022-08-03 22:27:54 +08:00
• 5e317b1914 API目录支持安卓编译，输出libmk_api.a (#1854) 明月惊鹊 2022-08-03 20:57:16 +08:00
• ec3fe4350a 修复开启时间戳覆盖后崩溃的bug: #1848 ziyue 2022-08-02 11:06:33 +08:00
• 70c7a7aa57 依赖 ZLMediaKit 的模块需要继承宏定义以及依赖 Xiaofeng Wang 2022-08-01 17:48:11 +08:00
• 32a6126a4b 修正docker编译问题 ziyue 2022-08-01 17:33:58 +08:00
• 2bd52fa93d 隐藏c sdk中webrtc相关代码 ziyue 2022-08-01 17:27:34 +08:00
• 3aa21389cc 删除Android openssl库 ziyue 2022-08-01 17:22:53 +08:00
• 13dd8c699b 整理cmake ziyue 2022-08-01 16:12:52 +08:00
• 98f158bf31 修正 OpenSSL 未开启问题 Xiaofeng Wang 2022-08-01 12:28:16 +08:00
• 316301e910 确保rtsp直接拉流代理支持GOP缓存: #1843 ziyue 2022-08-01 11:34:47 +08:00
• 25e9cd07db 避免其他模块查找过程污染基础环境 Xiaofeng Wang 2022-07-30 11:26:48 +08:00
• d9d33b8522 Merge pull request #1842 from wasphin/feature/apple-m1 Xiaofeng Wang 2022-07-29 19:59:07 +08:00