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

Mono Color

• e16d0e20f0 更新 xiongziliang 2018-09-20 10:55:35 +0800
• 23c2de9acf 初步完成一些类的抽象 xiongziliang 2018-09-19 12:34:29 +0800
• fab283da6f 抽象部分rtsp相关功能 xiongziliang 2018-09-18 23:49:48 +0800
• bb03af0f7f 优化代码 xiongziliang 2018-09-18 21:40:26 +0800
• 83df74561c 性能优化 xiongziliang 2018-09-18 17:02:20 +0800
• 8c8314bac7 更新ZLToolKit xiongziliang 2018-09-18 14:50:12 +0800
• c0fe4a1114 更新ZLToolKit xiongziliang 2018-09-17 16:48:39 +0800
• 0e9e41b277 更新ZLToolKit xiongziliang 2018-09-17 16:11:39 +0800
• 7e778eaf97 优化性能 xiongziliang 2018-09-17 11:34:35 +0800
• 4494e1b650 修复负载均衡算法bug xiongziliang 2018-09-17 11:05:19 +0800
• 97f984f2ec 修复死锁bug xiongziliang 2018-09-17 10:30:55 +0800
• e8ef8c22a6 完善负载均衡算法 xiongziliang 2018-09-17 10:11:37 +0800
• 2df966f52b Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit into develop xiongziliang 2018-09-14 23:22:12 +0800
• 8e5966ba0e 更新ZLToolKit，修复TCPSession构造时无法获取客户端ip的bug xiongziliang 2018-09-14 23:20:37 +0800
• 80ef20e672 update xiongziliang 2018-09-14 18:35:05 +0800
• 1dc5eed748 优化性能 xiongziliang 2018-09-14 18:21:39 +0800
• 492d083f5b 大幅优化性能 xiongziliang 2018-09-14 18:04:41 +0800
• 9b8bfe8a66
  Update README.md 1.0 夏楚 2018-09-07 17:39:02 +0800
• 3ed2602fd7
  Update README.md 夏楚 2018-09-07 17:38:48 +0800
• 76ceeca964
  Update README.md 夏楚 2018-09-07 17:38:01 +0800
• 717779029e
  Update README.md 夏楚 2018-09-07 17:24:34 +0800
• 6c97338712 完善代码 xiongziliang 2018-09-07 16:35:17 +0800
• 98f8024409 完善代码 xiongziliang 2018-09-07 16:28:58 +0800
• 237a7d71f3 优化hls xiongziliang 2018-09-03 10:28:41 +0800
• 4bb9bef320 完善代码 xiongziliang 2018-08-31 17:11:39 +0800
• a9048b4a4d 修复http-flv直播超时bug xiongziliang 2018-08-31 15:54:25 +0800
• 17423828ce 添加flv录制器 xiongziliang 2018-08-31 15:38:15 +0800
• 732eb2d197 完成FLV复用器改造 优化代码结构 xiongziliang 2018-08-31 14:13:00 +0800
• ef9ebc89e0 抽象FLV复用器 xiongziliang 2018-08-30 19:29:54 +0800
• 3ee2a14cf6 解决android下MediaExtractor无法解析的问题 xiongziliang 2018-08-30 10:05:50 +0800
• 9cf0ccc6b9 bug fixed xiongziliang 2018-08-29 18:25:17 +0800
• 9e17b44e77 支持设置时长 xiongziliang 2018-08-29 14:11:12 +0800
• 370d31121c 支持自动生成adts头 xiongziliang 2018-08-29 11:19:00 +0800
• d731454531 添加接口 xiongziliang 2018-08-28 23:20:55 +0800
• 36d1d3aa16 修复重复拷贝的bug xiongziliang 2018-08-20 10:18:04 +0800
• 076c45105c Merge remote-tracking branch 'origin/master' xiongziliang 2018-08-17 07:12:28 +0800
• 06bcece24b 忽略sps/pps/b/p/idr之外的帧 xiongziliang 2018-08-17 07:11:51 +0800
• 46e571f8bb update zltoolkit xiongziliang 2018-08-17 00:08:59 +0800
• 9f07f98001 修复bug xiongziliang 2018-08-16 11:32:18 +0800
• 015a61c465 update zltoolkit xiongziliang 2018-08-15 18:27:58 +0800
• 81e39763dc bug fixed xiongziliang 2018-08-15 18:23:38 +0800
• 309120a16a update zltoolkit xiongziliang 2018-08-14 14:02:23 +0800
• 1980bbc2b0 bug fixed xiongziliang 2018-08-10 14:40:31 +0800
• e486394184 优化rtmp握手体验 优化代码结构 添加rtmp鉴权时间统计 xiongziliang 2018-08-10 11:55:18 +0800
• 58376a3040 修复http-flv的bug xiongziliang 2018-08-09 11:07:53 +0800
• 4ee1625d37 update zltoolkit xiongziliang 2018-08-05 21:39:18 +0800
• 250f62e310 Merge branch 'master' of github.com:xiongziliang/ZLMediaKit xiongziliang 2018-08-04 23:59:43 +0800
• 5c8914e109 修复bug xiongziliang 2018-08-04 23:59:03 +0800
• 03263e37f2 Merge remote-tracking branch 'origin/master' xiongziliang 2018-07-30 11:58:57 +0800
• 3a5bf616ff 修复rtp不支持csrc、ext字段的bug xiongziliang 2018-07-30 11:58:39 +0800
• c7b0ac984b 适配ZLToolKit xiongziliang 2018-07-19 17:16:46 +0800
• efdc740fb4 update ZLToolKit xiongziliang 2018-07-11 00:38:04 +0800
• 678bdcdbfd 修复在win32上编译问题 xiongziliang 2018-07-06 23:04:43 +0800
• 23e73f7c62 bug fixed xiongziliang 2018-07-05 22:05:09 +0800
• d955b639d7 bug fixed xiongziliang 2018-07-05 18:56:11 +0800
• 0237a337a0 Merge remote-tracking branch 'origin/master' xiongziliang 2018-07-05 18:48:32 +0800
• 2edc4b1bd4 优化代码 xiongziliang 2018-07-05 18:48:08 +0800
• 7979fae23e 解决windows编译问题 xiongziliang 2018-07-04 17:07:07 +0800
• fcbf7cb122 修复编译bug xiongziliang 2018-07-03 17:48:29 +0800
• 7c7e9a7ea4 适配最新代码 xiongziliang 2018-07-03 17:30:58 +0800
• b7304808b3 单例接口放置在cpp文件中 xiongziliang 2018-07-03 17:10:11 +0800
• 35fd682c9a 适配ZLToolKit xiongziliang 2018-07-03 17:01:56 +0800
• 6ae243f459 更新ZLToolKit xiongziliang 2018-07-02 16:29:21 +0800
• 231f3df68f 更新功能描述 xiongziliang 2018-07-02 16:05:07 +0800
• b81392a9e1 更新功能描述 xiongziliang 2018-07-02 16:03:27 +0800
• a078010f36 优化参数以及参数命名 xiongziliang 2018-07-02 16:00:55 +0800
• bca084d080 优化rtsp播放器代码，支持md5认证 xiongziliang 2018-07-02 15:43:37 +0800
• 58b58418d6 无音频时生成静音音频，防止播放器加载画面太慢 修复MAC下SDL必须在主线程渲染的问题 xiongziliang 2018-06-30 23:02:16 +0800
• ae5482ec61 修复rtmp推流器bug/更新网络库 xiongziliang 2018-06-24 14:49:21 +0800
• 806cf29eac 支持是否修改rtmp时间戳配置 修改对象命名 xiongziliang 2018-06-21 14:14:05 +0800
• ca885013af 支持Http multipart/form-data 文件上传 优化http客户端超时逻辑 去除rtmp/rtsp代理时间戳覆盖逻辑 xiongziliang 2018-06-21 14:03:43 +0800
• 4c82903ee8 update ZLToolKit xiongziliang 2018-06-08 17:35:22 +0800
• cea02a5b74 bug fixed xiongziliang 2018-05-28 18:05:39 +0800
• fa6eedc46a 修复rtsp seek的问题 xiongziliang 2018-05-22 18:41:56 +0800
• 7c29c41767 修复mp4v2在win32上崩溃的问题 xiongziliang 2018-05-22 17:22:31 +0800
• 9c53248e39 mp4v2支持win32 xiongziliang 2018-05-22 11:41:20 +0800
• 1dbb08294f update ZLToolKit xiongziliang 2018-05-22 09:52:53 +0800
• 18bf6ec201 tcp客户端支持指定网卡 xiongziliang 2018-05-21 23:18:17 +0800
• 3b73e77710 update ZLToolKit xiongziliang 2018-05-21 10:10:38 +0800
• 161d5c7412 update ZLToolKit xiongziliang 2018-05-21 09:52:46 +0800
• 1e6a037712 update ZLToolKit xiongziliang 2018-05-21 09:41:15 +0800
• 6e1250aeac update xiongziliang 2018-05-18 18:48:17 +0800
• 40b9aa0974 更新ZLToolKit xiongziliang 2018-05-17 23:07:20 +0800
• 9e7acbdfdd 更新ZLToolKit xiongziliang 2018-05-17 21:03:26 +0800
• d3d8ffd9a3 update ZLToolKit xiongziliang 2018-05-09 18:36:42 +0800
• 82a76cb508 sync ZLToolKit xiongziliang 2018-05-09 11:22:14 +0800
• e0fad8eb23 Update CMakeLists.txt 夏楚 2018-05-07 10:02:37 +0800
• 07ccf2e91c 更新ZLToolKit xiongziliang 2018-05-03 09:22:04 +0800
• 5a4a10471e 修复兼容性bug xiongziliang 2018-04-28 18:37:52 +0800
• facb87a1da 更新zltoolkit xiongziliang 2018-04-28 18:15:41 +0800
• 5a370bffaa update zltoolkit xiongziliang 2018-04-17 22:28:20 +0800
• 8021360d76 改成硬件渲染 xiongziliang 2018-04-17 21:47:31 +0800
• b79e226fca bug fixed xiongziliang 2018-04-17 21:44:18 +0800
• b1e6031d7a 替换成sdl2 xiongziliang 2018-04-17 21:38:13 +0800
• 9ac048240b 优化日志 xiongziliang 2018-04-09 11:33:19 +0800
• 7f1f3b0657 优化日志 xiongziliang 2018-04-09 11:26:39 +0800
• fcc1715a61 解决点播误删文件的问题 xiongziliang 2018-03-30 11:48:10 +0800
• f48bef85bf 优化hls xiongziliang 2018-03-28 16:06:51 +0800
• e5fe34cafb 优化hls卡顿现象 xiongziliang 2018-03-28 15:56:47 +0800
• f90a389304 解决hls iPhone无法播放的问题 xiongziliang 2018-03-27 12:42:06 +0800