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

#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

• 64449f0362 更新ZLToolKit(TcpServer支持多个poller线程同时监听，大幅提高accept性能) xiongziliang 2019-03-14 17:21:50 +0800
• 0603e95557 修复cookie过期判断不准的bug xiongziliang 2019-03-14 09:59:07 +0800
• 327acdf562 媒体源注册时强制覆盖 xiongziliang 2019-03-13 20:12:34 +0800
• 9dfb275ad5 删除重复代码 xiongziliang 2019-03-11 11:23:50 +0800
• 38fd547b08 修复rtmp复合包边界检查bug xiongziliang 2019-03-04 09:44:10 +0800
• 0808cdee4b 修复rtmp解复用器可能丢失config帧的bug xiongziliang 2019-03-01 18:47:58 +0800
• db261260ff 修复编译问题 xiongziliang 2019-03-01 15:11:58 +0800
• 40a7913bf9 播放器支持超时时间的配置项 优化函数命名 xiongziliang 2019-03-01 14:23:28 +0800
• e240044f2f 优化rtmp相关性能 xiongziliang 2019-02-28 18:20:17 +0800
• e7fc22ad53 初步支持聚合包 xiongziliang 2019-02-28 18:03:49 +0800
• d5d03ce90c Merge remote-tracking branch 'origin/master' xiongziliang 2019-02-27 17:33:55 +0800
• a6d27306d0 修复某些rtmp流无metedata时导致崩溃的问题 xiongziliang 2019-02-27 17:33:38 +0800
• 8ad59a937d 修复Windows下启用mysql后编译失败的问题 xiongziliang 2019-02-27 11:25:25 +0800
• 63b8477f0d Merge branch 'master' of https://github.com/DroidChow/ZLMediaKit xiongziliang 2019-02-26 15:56:35 +0800
• af194677de 修复rtsp流播放声音不连续情况, 修改AAC数据包解析bug droid.chow 2019-02-26 10:11:42 +0800
• 4c136d6d2d 更新ZLToolKit(修复select监听无效文件描述符的问题) xiongziliang 2019-02-22 09:50:32 +0800
• cce454d78c 更新ZLToolKit(提高线程切换性能) xiongziliang 2019-02-19 17:21:30 +0800
• f7c73c7525 更新ZLToolKit xiongziliang 2019-02-17 14:13:52 +0800
• 62e6c7cb98 修复http下载时Transfer-Encoding=chunked提前断开的情况 xiongziliang 2019-02-17 13:35:12 +0800
• ef95f195f9 更新ZLToolKit(优化定时器性能) xiongziliang 2019-02-13 09:54:25 +0800
• 4a3f72c017 更新ZLToolKit(修复windows下编译的问题) xiongziliang 2019-02-13 09:30:26 +0800
• 143862fc77 更新ZLToolKit(优化定时器) xiongziliang 2019-02-11 20:45:30 +0800
• c9b91ca7af 优化代码 xiongziliang 2019-02-11 16:29:27 +0800
• d9965b23ec 适配ZLToolKit最新代码 xiongziliang 2019-02-11 16:24:05 +0800
• 1823203509 修复定时器相关bug xiongziliang 2019-01-30 18:15:18 +0800
• 3f2137db8a 基本废弃 AsyncTaskThread的代码 xiongziliang 2019-01-30 18:11:00 +0800
• bf974d5b0c 性能优化 xiongziliang 2019-01-30 17:27:52 +0800
• 6ecd21cd6c 恢复原来代码 xiongziliang 2019-01-30 17:26:02 +0800
• c0d3c0f032 适配ZLToolKit(更新定时器) xiongziliang 2019-01-30 17:21:14 +0800
• b5ea9fac08 适配ZLToolKit(更新定时器) xiongziliang 2019-01-30 17:00:28 +0800
• cc7556b5a8 兼容把SPS PPS IDR打包在一起的帧 3.0 xiongziliang 2019-01-30 11:44:41 +0800
• 7ba81499ec 删除过期接口 xiongziliang 2019-01-28 09:37:14 +0800
• 30e5d37c8a 更新ZLToolKit(修复android上的编译bug) xiongziliang 2019-01-28 09:36:25 +0800
• 7194afed21 更新ZLToolKit(优化日志性能) xiongziliang 2019-01-25 17:04:41 +0800
• 297e5d77bb 优化rtsp播放器的打开速度 xiongziliang 2019-01-24 18:03:47 +0800
• c3ce2a463b 优化rtsp播放器的打开速度 xiongziliang 2019-01-24 17:52:41 +0800
• a646640580 修复AAC rtp解码相关的bug xiongziliang 2019-01-24 12:21:29 +0800
• 22962a407e
  Update README.md 夏楚 2019-01-24 10:39:18 +0800
• 2156d572cb 更新ZLToolKit(优化循环池对象回收性能) xiongziliang 2019-01-23 10:55:06 +0800
• cb3bcf7f92 更新ZLToolKit(修复SSL相关bug) xiongziliang 2019-01-22 10:49:57 +0800
• 70e740c842 更新ZLToolKit(更新信号量对象) xiongziliang 2019-01-21 15:16:13 +0800
• f3c7124939 修复264Track获取宽高错误的bug xiongziliang 2019-01-21 12:02:44 +0800
• 950dfb15fd 恢复Trace日志 xiongziliang 2019-01-18 13:54:20 +0800
• 066e3217ea rtsp播放器支持302跳转 xiongziliang 2019-01-18 11:27:51 +0800
• 4ab1d4ca44 更新ZLToolKit(解决可能丢失事件的问题) xiongziliang 2019-01-18 10:16:36 +0800
• 059c118e95 H264 RTP解码支持STAP-A(24）类型 更新ZLToolKit(修复logger相关bug) xiongziliang 2019-01-17 18:26:28 +0800
• 49c8d4fb8d 修复rtsp推流超时检测bug xiongziliang 2019-01-16 17:58:54 +0800
• d482cd29c4 修复编译警告问题 xiongziliang 2019-01-16 14:26:06 +0800
• b92e837640 兼容一些不规范的播放器 xiongziliang 2019-01-11 10:45:03 +0800
• 37c397c4a4 更新ZLToolKit，修复bug xiongziliang 2019-01-08 18:07:32 +0800
• 5c62887890 完善HttpRequester xiongziliang 2019-01-07 14:04:01 +0800
• e8a73997ce 更新ZLToolKit xiongziliang 2019-01-04 17:00:22 +0800
• faab85e2ca 完善Http客户端复用机制 xiongziliang 2019-01-03 15:05:52 +0800
• bdaeada3c9 修复android上的编译问题 xiongziliang 2019-01-02 18:46:32 +0800
• 3204dafd51 自动计算GOP缓存大小 xiongziliang 2018-12-29 17:46:55 +0800
• 5b5db04543 支持自定义环形缓冲大小 xiongziliang 2018-12-29 17:38:10 +0800
• 41e5cab6c6 添加bom头 xiongziliang 2018-12-28 18:07:47 +0800
• 5e7c20c406 更新ZLToolKit xiongziliang 2018-12-28 18:03:39 +0800
• 2dfbc03c36 更新ZLToolKit xiongziliang 2018-12-28 17:22:31 +0800
• 4a218b9048 修复gcc4.8不支持动态模板参数捕获的编译bug xiongziliang 2018-12-28 17:06:45 +0800
• cc7844a994 适配ZLToolKit代码，简化程序退出流程代码 xiongziliang 2018-12-28 16:47:50 +0800
• 315cd180d4 完善README xiongziliang 2018-12-26 14:08:55 +0800
• 8d691e160e
  Update README.md 夏楚 2018-12-25 18:38:25 +0800
• 8b7986b4fc 修改时间戳溢出的bug xiongziliang 2018-12-25 09:30:49 +0800
• a904a42125 完善范例程序 xiongziliang 2018-12-21 17:31:53 +0800
• 5ac1fb73a7 修复rtsp相关bug xiongziliang 2018-12-21 17:12:26 +0800
• 50e1dddd12 完善 xiongziliang 2018-12-21 14:46:14 +0800
• 1d2398e34d 完善readme xiongziliang 2018-12-21 11:12:11 +0800
• 95fe653a45 完善Readme xiongziliang 2018-12-21 11:09:39 +0800
• e8c24bdbc8
  Update README.md 夏楚 2018-12-21 10:07:19 +0800
• 338c2e18fc 过滤无效rtp包 xiongziliang 2018-12-20 17:06:33 +0800
• c64bf1ea7a 修复udp发送相关bug xiongziliang 2018-12-20 16:59:54 +0800
• 166bbb0be0 修复mtu配置无法加载的bug xiongziliang 2018-12-20 15:42:46 +0800
• 5182f0cddb 更新可用的rtmp链接 xiongziliang 2018-12-20 15:06:24 +0800
• 2d6c2cb9d4 更新库 xiongziliang 2018-12-20 10:46:53 +0800
• 1d13aa84fa 移除废弃接口 xiongziliang 2018-12-20 10:42:51 +0800
• 5deecaf954 优化代码 xiongziliang 2018-12-20 10:31:31 +0800
• efa2234e49 完善注释和范例 xiongziliang 2018-12-19 18:18:24 +0800
• 99a4bc3c1d 精简配置文件 xiongziliang 2018-12-19 17:55:16 +0800
• 029fdaeae6 精简配置文件 xiongziliang 2018-12-19 17:53:43 +0800
• 314c4cfa7a 更新readme xiongziliang 2018-12-19 17:21:11 +0800
• 84e0e83366 支持ssl加密的Rtsp服务器 xiongziliang 2018-12-19 16:54:11 +0800
• 30f8d4da38 修复bug 2.0 xiongziliang 2018-12-18 11:56:37 +0800
• 70c3e97f14 更新readme xiongziliang 2018-12-17 15:28:19 +0800
• d2a78e5a40 完成rtsp推流 xiongziliang 2018-12-17 15:21:23 +0800
• 925d397ea4
  Merge pull request #1 from xiongziliang/master haopeng 2018-12-17 14:47:03 +0800
• 212a761e7f 优化rtsp相关代码 xiongziliang 2018-12-17 13:48:19 +0800
• 0c5cd62429 优化rtsp over http，删除冗余代码 xiongziliang 2018-12-17 13:14:49 +0800
• e52c67b3af 修复可能存在的bug xiongziliang 2018-12-17 09:24:39 +0800
• f881860adb 修复除0 bug xiongziliang 2018-12-14 18:24:27 +0800
• 9da5a35524 初步支持rtsp推流 xiongziliang 2018-12-14 18:13:05 +0800
• 84fde961d7 提取RTP解析代码 xiongziliang 2018-12-14 17:46:12 +0800
• dd2192fd5e rtp over udp改成独占式端口，提高性能 xiongziliang 2018-12-14 17:10:24 +0800
• f411ddc23c 优化rtsp服务器代码 修复一个rtp over http的bug xiongziliang 2018-12-14 14:59:12 +0800
• 91d8888784 关闭MediaPlayer的播放器复用功能 xiongziliang 2018-12-10 15:37:55 +0800
• dd7c7375f4 删除多余文件 xiongziliang 2018-11-29 11:51:04 +0800
• 170e2f9480 忽略生成的文件 xiongziliang 2018-11-29 10:22:28 +0800
• 73f34ea089 添加bom头 xiongziliang 2018-11-27 16:07:33 +0800
• ad25ea184c 优化代码 xiongziliang 2018-11-27 11:05:44 +0800
• 858d2996c4 修复Windows下可能编译失败的问题 xiongziliang 2018-11-27 10:48:49 +0800