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

• 6d267e7206 完善openssl的版本判断 xiongziliang 2018-03-02 13:40:17 +08:00
• 418c110893 解决metadata无媒体信息导致不能转换格式的问题 xiongziliang 2018-03-01 14:32:11 +08:00
• f5c7f4328c 删除多余文件 xiongziliang 2018-03-01 11:49:06 +08:00
• c2b11e3868 完善http超时管理 xiongziliang 2018-02-28 17:30:12 +08:00
• d9dea060d3 返回端口号 xiongziliang 2018-02-28 10:58:36 +08:00
• fe4da29fb1 update xiongziliang 2018-02-24 15:18:16 +08:00
• 15f03476c3 修复编写失败的问题 xiongziliang 2018-02-24 10:45:19 +08:00
• a2751ced5e fix xiongziliang 2018-02-23 17:06:56 +08:00
• 3bc6ad4c90 Merge branch '2.0-alpha' of github.com:xiongziliang/ZLMediaKit into 2.0-alpha xiongziliang 2018-02-23 15:37:31 +08:00
• f1b4a196c6 适配ZLToolKit develop分支 xiongziliang 2018-02-23 15:36:51 +08:00
• 23560ac49b 添加警告log xiongziliang 2018-02-14 23:47:56 +08:00
• b0a64d1e6f 广播添加sender参数 xiongziliang 2018-02-09 15:50:21 +08:00
• 4cf09bdaa1 支持多变量 xiongziliang 2018-02-09 14:15:56 +08:00
• 70bb1a652a 添加配置文件热加载功能 xiongziliang 2018-02-09 11:42:55 +08:00
• 551b9a437b shell登录鉴权改成广播方式 删除rtsp/rtmp shell命令,添加media命令 加载配置文件后发送广播 xiongziliang 2018-02-08 17:24:42 +08:00
• 3c40f171c1 组播地址改成字符串 xiongziliang 2018-02-07 13:43:44 +08:00
• 5ed2ce40fe 修改文件录制、hls生成、拉流代理逻辑 xiongziliang 2018-02-07 11:16:43 +08:00
• ae1b62c78f Http客户端添加超时功能 xiongziliang 2018-02-06 17:35:32 +08:00
• c801de9965 修复http-flv流量统计的bug xiongziliang 2018-02-06 16:34:02 +08:00
• d375116e6d 优化鉴权invoker定义 xiongziliang 2018-02-06 16:17:37 +08:00
• 991715fc93 添加流量统计广播、整理广播参数类型 xiongziliang 2018-02-06 15:28:27 +08:00
• fa5f90599c update xiongziliang 2018-02-06 11:39:52 +08:00
• 4f072eb36a 添加踢出推流器功能 xiongziliang 2018-02-06 10:56:58 +08:00
• cf8b6f6b91 鉴权失败添加错误描述信息 xiongziliang 2018-02-05 17:25:22 +08:00
• 805a1a945e 修复travis-ci编译不过的问题 xiongziliang 2018-02-05 16:28:15 +08:00
• ec902f5164 添加 http-flv/rtmp/rtsp通用鉴权接口 xiongziliang 2018-02-05 15:56:44 +08:00
• 6da3a577a6 初步提交2.0版本，支持虚拟主机 xiongziliang 2018-02-02 18:19:35 +08:00
• bd72a69d33 初步提交2.0版本，支持虚拟主机 xiongziliang 2018-02-02 18:06:08 +08:00
• 1262c4c51d bug fixed on http server root 2018-01-31 11:20:50 +08:00
• 8ef84473fc bug fixed xiongziliang 2018-01-31 09:55:55 +08:00
• aa0ae0c865 优化http服务器性能 xiongziliang 2018-01-31 09:31:07 +08:00
• 49375fd926 http文件服务器支持跨域 xiongziliang 2018-01-30 17:25:19 +08:00
• 7974506129 去除编译警告 771730766@qq.com 2018-01-30 15:15:24 +08:00
• 8f10cdbacd 优化rtmp内存估算 771730766@qq.com 2018-01-30 13:52:11 +08:00
• a97b7ce701 优化http服务器性能 771730766@qq.com 2018-01-30 11:47:56 +08:00
• ddd4f57fe8 添加jemalloc支持 771730766@qq.com 2018-01-30 11:26:32 +08:00
• 8c50aa6c66 优化性能 771730766@qq.com 2018-01-30 11:23:57 +08:00
• 28b8e8e09f 大幅优化RTSP服务器性能 771730766@qq.com 2018-01-30 09:35:54 +08:00
• 25551ef3e6 程序退出清理 xiongziliang 2018-01-25 09:12:41 +08:00
• 93a1b16305 修复windows下http-flv的bug xiongziliang 2018-01-23 15:42:09 +08:00
• 82e3907dfa update xzl 2017-12-29 18:46:01 +08:00
• 723c1294c6 Update README.md 夏楚 2017-12-28 15:24:18 +08:00
• 7bf5451137 Update README.md 夏楚 2017-12-27 11:24:09 +08:00
• 308ba31d65 修复编译不过的bug xiongziliang 2017-12-22 14:27:17 +08:00
• 6ff01f55c4 增加adts头相关接口 xiongziliang 2017-12-19 10:34:52 +08:00
• 68bc9b6a6a 修复android可能编译不过的bug 夏楚 2017-12-15 17:12:25 +08:00
• 45455de1a5 Update README.md 夏楚 2017-12-15 16:10:41 +08:00
• b0c567e49d 删除多余文件 xiongziliang 2017-12-15 16:03:23 +08:00
• 25ec025553 Merge remote-tracking branch 'origin/master' xiongziliang 2017-12-15 16:01:44 +08:00
• 8f8e4abc39 支持http-flv直播 xiongziliang 2017-12-15 16:01:21 +08:00
• 5c83a905d6 Update README.md 夏楚 2017-12-14 09:48:20 +08:00
• ceec650fd7 Update README.md 夏楚 2017-12-14 09:47:22 +08:00
• 50f93cdc0b 添加c接口及测试程序 xiongziliang 2017-12-13 18:15:22 +08:00
• 22448bf48a 添加win测试程序 xiongziliang 2017-12-13 14:21:40 +08:00
• f347bec3cb 添加win测试程序 xiongziliang 2017-12-13 14:18:10 +08:00
• 34176f0e2b Update README.md 夏楚 2017-12-13 11:25:15 +08:00
• 4a9bbdb5f2 rtsp支持鉴权 夏楚 2017-12-10 01:44:06 +08:00
• 5ce5da0d1d 新增rtsp鉴权 夏楚 2017-12-10 01:42:14 +08:00
• f3e551b3b9 支持可配置化的RTSP登录认证 xiongziliang 2017-12-10 01:34:43 +08:00
• 02aba328c1 支持跨域访问 xiongziliang 2017-12-09 16:43:47 +08:00
• 15afeb7f61 Merge branch 'master' of github.com:xiongziliang/ZLMediaKit xiongziliang 2017-12-09 16:25:35 +08:00
• db73430c54 修复Keep-Alive的bug xiongziliang 2017-12-09 16:24:07 +08:00
• 450a5da011 添加linux目标程序 root 2017-12-09 11:46:52 +08:00
• e8e35dcfe4 删除无用文件 xiongziliang 2017-12-08 23:42:36 +08:00
• 6614b701f2 新增mac目标文件 xiongziliang 2017-12-08 23:01:09 +08:00
• 42d382878d 完善HTTP API功能 xiongziliang 2017-12-08 22:37:17 +08:00
• ad553900b4 Update benchmark.md 夏楚 2017-12-05 10:15:10 +08:00
• 513ef91081 Update benchmark.md 夏楚 2017-12-05 10:14:24 +08:00
• 509f33a880 更新为Release版本测试 夏楚 2017-12-05 00:30:00 +08:00
• a32c97f8b5 优化性能 xiongziliang 2017-12-04 23:55:09 +08:00
• 882210abd2 Update benchmark.md 夏楚 2017-12-04 17:59:48 +08:00
• 9735541894 Update benchmark.md 夏楚 2017-12-04 17:53:31 +08:00
• 9ac224f026 Update benchmark.md 夏楚 2017-12-04 13:49:34 +08:00
• f42e4299fd 添加测试报告 夏楚 2017-12-03 17:51:32 +08:00
• f38a21e99f Update benchmark.md 夏楚 2017-12-03 17:47:33 +08:00
• 7754aee764 Update benchmark.md 夏楚 2017-12-03 17:46:51 +08:00
• 0f89fbe937 添加测试报告 xiongziliang 2017-12-03 17:45:54 +08:00
• c8c1eee25d Update CMakeLists.txt 夏楚 2017-12-01 18:26:48 +08:00
• 473b9356a6 ShellSession跟业务隔离 xiongziliang 2017-12-01 11:42:49 +08:00
• e2d509e63f Merge branch 'master' of github.com:xiongziliang/ZLMediaKit merge xiongziliang 2017-11-09 18:14:44 +08:00
• 0588c47bd2 优化HLS延时 xiongziliang 2017-11-09 18:14:16 +08:00
• a3102a68a5 Update README.md 夏楚 2017-11-08 17:05:58 +08:00
• 45070dbfff 支持rtcp心跳包 xiongziliang 2017-11-08 16:57:05 +08:00
• 101261c299 支持rtcp心跳包 xiongziliang 2017-11-08 16:56:02 +08:00
• 8242ad674d 删除cmake log xiongziliang 2017-10-19 16:22:26 +08:00
• f5138163fb 修改cmake脚本 xiongziliang 2017-10-13 15:44:59 +08:00
• 556552d224 修改cmake脚本 xiongziliang 2017-10-13 15:23:37 +08:00
• 73c4740453 添加build快捷方式 xiongziliang 2017-10-13 15:19:24 +08:00
• c0d6765662 fixed xiongziliang 2017-10-10 00:11:58 +08:00
• fa39514e52 windows下删除转码步骤 夏楚 2017-10-10 00:07:49 +08:00
• e1b732e944 windows支持gb2312编码 xiongziliang 2017-10-10 00:04:07 +08:00
• d26d484ecf “添加bom头 xiongziliang 2017-10-09 22:11:01 +08:00
• fecfbbe101 修复windows下编译不过的bug 夏楚 2017-10-09 11:24:00 +08:00
• 4a6b5bc46a Update README.md 夏楚 2017-10-09 11:13:31 +08:00
• bf6b964f95 Update README.md 夏楚 2017-10-09 11:06:59 +08:00
• c367df73a5 整理代码，添加注释 xiongziliang 2017-09-30 13:00:12 +08:00
• e6bdfbce5c Create README.md 夏楚 2017-09-28 15:32:55 +08:00
• e3272e0d89 add zltoolkit xiongziliang 2017-09-27 17:09:42 +08:00
• 66083173c0 Delete .gitmodules 夏楚 2017-09-27 16:59:36 +08:00
• 85a8e69621 Create .gitmodules 夏楚 2017-09-27 16:52:32 +08:00