ZLMediaKit

amass/ZLMediaKit

Fork 0

mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00

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

#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

#4034

#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

b6fbae2e73 bug fix xiongziliang 2018-03-27 00:40:22 +0800
3c2396f8d7 bug fix xiongziliang 2018-03-26 22:34:49 +0800
f79475f700 解决一些设备的兼容性问题 xiongziliang 2018-03-26 22:15:18 +0800
1cd342d00a 解决sdp解析失败的问题 xiongziliang 2018-03-26 18:56:22 +0800
476dfe7076 del log xiongziliang 2018-03-26 14:18:00 +0800
c64164b329 Update README.md 夏楚 2018-03-21 17:17:58 +0800
31250663c8 update xiongziliang 2018-03-21 16:30:12 +0800
732abcbf05 update xiongziliang 2018-03-21 16:28:15 +0800
745e83fbb5 修复编译问题 xiongziliang 2018-03-21 16:16:04 +0800
fc6a544206 update xiongziliang 2018-03-21 16:01:41 +0800
17812e1bad 更新编译脚本 xiongziliang 2018-03-21 15:50:07 +0800
c6ed0dae86 更新为mingw64编译 xiongziliang 2018-03-21 15:30:28 +0800
62137c029a 更新编译脚本 xiongziliang 2018-03-21 15:23:05 +0800
03e1dab1de 解决编译错误以及运行期bug xiongziliang 2018-03-21 15:13:33 +0800
92904e9633 修复编译问题 xiongziliang 2018-03-21 11:35:00 +0800
f4806c7e6c Update README.md 夏楚 2018-03-20 11:50:37 +0800
dc8796fcfb Update README.md 夏楚 2018-03-20 11:50:01 +0800
8dcf6d7110 Update README.md 夏楚 2018-03-20 11:48:05 +0800
11f6251f9e 添加bom、完善rtsp客户端兼容性 xiongziliang 2018-03-20 11:28:13 +0800
ab924cff48 Delete build 夏楚 2018-03-19 10:48:02 +0800
941d55b86f 修改编译脚本、readme xiongziliang 2018-03-19 10:45:31 +0800
a47e34ff3e rtmp未找到流后延迟重试 xiongziliang 2018-03-14 22:35:54 +0800
b2afeea375 优化http文件服务器性能 xiongziliang 2018-03-14 22:32:36 +0800
026108d304 适配网络库 xiongziliang 2018-03-14 14:51:54 +0800
55babaebd1 删除废代码 xiongziliang 2018-03-14 11:30:14 +0800
1ee83ec5d5 修复windows下的编译问题 xiongziliang 2018-03-05 10:41:15 +0800
0ad6cb1dce 内部生成时间戳 xiongziliang 2018-03-02 15:00:04 +0800
c48ada6940 去除缓存池功能 xiongziliang 2018-03-02 14:33:57 +0800
5676b45580 完善openssl的版本判断 xiongziliang 2018-03-02 13:40:57 +0800
9f44ab4934 完善openssl的版本判断 xiongziliang 2018-03-02 13:40:17 +0800
61fac4d1f3 解决metadata无媒体信息导致不能转换格式的问题 xiongziliang 2018-03-01 14:32:11 +0800
29b7a386f5 删除多余文件 xiongziliang 2018-03-01 11:49:06 +0800
323c8059f8 完善http超时管理 xiongziliang 2018-02-28 17:30:12 +0800
8231bbc562 返回端口号 xiongziliang 2018-02-28 10:58:36 +0800
115c793787 update xiongziliang 2018-02-24 15:18:16 +0800
184edeed87 修复编写失败的问题 xiongziliang 2018-02-24 10:45:19 +0800
59a0cd8cdd fix xiongziliang 2018-02-23 17:06:56 +0800
872b07e4b7 适配ZLToolKit develop分支 xiongziliang 2018-02-23 15:36:51 +0800
87b81def8c 添加警告log xiongziliang 2018-02-14 23:47:56 +0800
7aa43808d5 广播添加sender参数 xiongziliang 2018-02-09 15:50:21 +0800
fe4139c932 支持多变量 xiongziliang 2018-02-09 14:15:56 +0800
7dd8969644 添加配置文件热加载功能 xiongziliang 2018-02-09 11:42:55 +0800
c0173e08be shell登录鉴权改成广播方式删除rtsp/rtmp shell命令,添加media命令加载配置文件后发送广播 xiongziliang 2018-02-08 17:24:42 +0800
9e9a6fa38c 组播地址改成字符串 xiongziliang 2018-02-07 13:43:44 +0800
5199e6356f 修改文件录制、hls生成、拉流代理逻辑 xiongziliang 2018-02-07 11:16:43 +0800
4cc19ccf76 Http客户端添加超时功能 xiongziliang 2018-02-06 17:35:32 +0800
3ef93b8f8c 修复http-flv流量统计的bug xiongziliang 2018-02-06 16:34:02 +0800
1178eaaa19 优化鉴权invoker定义 xiongziliang 2018-02-06 16:17:37 +0800
74f49a7443 添加流量统计广播、整理广播参数类型 xiongziliang 2018-02-06 15:28:27 +0800
fc362f122d update xiongziliang 2018-02-06 11:39:52 +0800
c9db95935c 添加踢出推流器功能 xiongziliang 2018-02-06 10:56:58 +0800
b2e64465c4 鉴权失败添加错误描述信息 xiongziliang 2018-02-05 17:25:22 +0800
892ec9088a 修复travis-ci编译不过的问题 xiongziliang 2018-02-05 16:28:15 +0800
aa2260d705 添加 http-flv/rtmp/rtsp通用鉴权接口 xiongziliang 2018-02-05 15:56:44 +0800
6da260286d 初步提交2.0版本，支持虚拟主机 xiongziliang 2018-02-02 18:19:35 +0800
05b714142a 初步提交2.0版本，支持虚拟主机 xiongziliang 2018-02-02 18:06:08 +0800
2e14a7aebf bug fixed on http server root 2018-01-31 11:20:50 +0800
57faa7ddc6 bug fixed xiongziliang 2018-01-31 09:55:55 +0800
4dfda2d0d9 优化http服务器性能 xiongziliang 2018-01-31 09:31:07 +0800
f7b77cdbfd http文件服务器支持跨域 xiongziliang 2018-01-30 17:25:19 +0800
a69168f8fa 去除编译警告 771730766@qq.com 2018-01-30 15:15:24 +0800
4c4aa61da4 优化rtmp内存估算 771730766@qq.com 2018-01-30 13:52:11 +0800
f8590013c3 优化http服务器性能 771730766@qq.com 2018-01-30 11:47:56 +0800
ce8cb1784f 添加jemalloc支持 771730766@qq.com 2018-01-30 11:26:32 +0800
c2886123d1 优化性能 771730766@qq.com 2018-01-30 11:23:57 +0800
106ab065c8 大幅优化RTSP服务器性能 771730766@qq.com 2018-01-30 09:35:54 +0800
e509b1645b 程序退出清理 xiongziliang 2018-01-25 09:12:41 +0800
2997b4a7c6 修复windows下http-flv的bug xiongziliang 2018-01-23 15:42:09 +0800
76e3aaaa29 update xiongziliang 2018-05-18 18:48:17 +0800
b02b5c0f28 更新ZLToolKit xiongziliang 2018-05-17 23:07:20 +0800
696af18fa0 更新ZLToolKit xiongziliang 2018-05-17 21:03:26 +0800
0423caac04 update ZLToolKit xiongziliang 2018-05-09 18:36:42 +0800
78f12dddc5 sync ZLToolKit xiongziliang 2018-05-09 11:22:14 +0800
748bf144e8

Update CMakeLists.txt 夏楚 2018-05-07 10:02:37 +0800
ad93435868 更新ZLToolKit xiongziliang 2018-05-03 09:22:04 +0800
f6074bfd25 修复兼容性bug xiongziliang 2018-04-28 18:37:52 +0800
07d6546a96 更新zltoolkit xiongziliang 2018-04-28 18:15:41 +0800
97e1efd3c0 update zltoolkit xiongziliang 2018-04-17 22:28:20 +0800
e4d2509acd 改成硬件渲染 xiongziliang 2018-04-17 21:47:31 +0800
71174f906b bug fixed xiongziliang 2018-04-17 21:44:18 +0800
bd04b2e2ab 替换成sdl2 xiongziliang 2018-04-17 21:38:13 +0800
6a9bc8aca5 优化日志 xiongziliang 2018-04-09 11:33:19 +0800
9fe6587bd3 优化日志 xiongziliang 2018-04-09 11:26:39 +0800
e63daba2f0 解决点播误删文件的问题 xiongziliang 2018-03-30 11:48:10 +0800
800ab3e137 优化hls xiongziliang 2018-03-28 16:06:51 +0800
730db98ad8 优化hls卡顿现象 xiongziliang 2018-03-28 15:56:47 +0800
f2e82fc2cc 解决hls iPhone无法播放的问题 xiongziliang 2018-03-27 12:42:06 +0800
412424b2bb bug fix xiongziliang 2018-03-27 00:40:22 +0800
8318ccd92a bug fix xiongziliang 2018-03-26 22:34:49 +0800
782b1b479e 解决一些设备的兼容性问题 xiongziliang 2018-03-26 22:15:18 +0800
03507e5bfc 解决sdp解析失败的问题 xiongziliang 2018-03-26 18:56:22 +0800
770651467e Merge remote-tracking branch 'origin/master' xiongziliang 2018-03-26 14:19:07 +0800
ad47cd1d04 del log xiongziliang 2018-03-26 14:18:00 +0800
3addd5452d

Update README.md 夏楚 2018-03-21 17:17:58 +0800
81cb97f032 update xiongziliang 2018-03-21 16:30:12 +0800
d8249e304f update xiongziliang 2018-03-21 16:28:15 +0800
fe779bc5dc 修复编译问题 xiongziliang 2018-03-21 16:16:04 +0800
7a9a63c812 update xiongziliang 2018-03-21 16:01:41 +0800
e95ca00f62 更新编译脚本 xiongziliang 2018-03-21 15:50:07 +0800
8dc6e4096c 更新为mingw64编译 xiongziliang 2018-03-21 15:30:28 +0800