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

• a3102a68a5
  Update README.md 夏楚 2017-11-08 17:05:58 +0800
• 45070dbfff 支持rtcp心跳包 xiongziliang 2017-11-08 16:57:05 +0800
• 101261c299 支持rtcp心跳包 xiongziliang 2017-11-08 16:56:02 +0800
• 8242ad674d 删除cmake log xiongziliang 2017-10-19 16:22:26 +0800
• f5138163fb 修改cmake脚本 xiongziliang 2017-10-13 15:44:59 +0800
• 556552d224 修改cmake脚本 xiongziliang 2017-10-13 15:23:37 +0800
• 73c4740453 添加build快捷方式 xiongziliang 2017-10-13 15:19:24 +0800
• c0d6765662 fixed xiongziliang 2017-10-10 00:11:58 +0800
• fa39514e52 windows下删除转码步骤 夏楚 2017-10-10 00:07:49 +0800
• e1b732e944 windows支持gb2312编码 xiongziliang 2017-10-10 00:04:07 +0800
• d26d484ecf “添加bom头 xiongziliang 2017-10-09 22:11:01 +0800
• fecfbbe101 修复windows下编译不过的bug 夏楚 2017-10-09 11:24:00 +0800
• 4a6b5bc46a Update README.md 夏楚 2017-10-09 11:13:31 +0800
• bf6b964f95 Update README.md 夏楚 2017-10-09 11:06:59 +0800
• c367df73a5 整理代码，添加注释 xiongziliang 2017-09-30 13:00:12 +0800
• e6bdfbce5c Create README.md 夏楚 2017-09-28 15:32:55 +0800
• e3272e0d89 add zltoolkit xiongziliang 2017-09-27 17:09:42 +0800
• 66083173c0 Delete .gitmodules 夏楚 2017-09-27 16:59:36 +0800
• 85a8e69621 Create .gitmodules 夏楚 2017-09-27 16:52:32 +0800
• dd49042279 Update LICENSE 夏楚 2017-09-27 16:26:24 +0800
• 1d1d2516e9 添加版权信息 xiongziliang 2017-09-27 16:20:30 +0800
• 8732cbf2b8 修改拼写错误 xiongziliang 2017-09-27 14:52:34 +0800
• 80b80c2ab8 提高兼容性 xiongziliang 2017-09-22 20:01:12 +0800
• 9a2f0fb547 update xiongziliang 2017-09-21 16:55:30 +0800
• 46d1d80954 添加兼容性适配代码 xiongziliang 2017-09-21 16:51:44 +0800
• 2c34ac6de7 Update README.md 夏楚 2017-09-14 11:20:25 +0800
• e89134e077 Update README.md 夏楚 2017-09-14 11:11:13 +0800
• a0e6aa2fb4 Update README.md 夏楚 2017-09-14 11:08:43 +0800
• f68dddfa9c 添加rtmp推流mp4文件范例 xiongziliang 2017-09-05 19:51:25 +0800
• 2aecc862b8 添加时间戳增量纠偏逻辑 xzl 2017-09-05 15:20:02 +0800
• 9c8f604868 修复Http POST Content为空不响应的bug xzl 2017-09-04 15:39:05 +0800
• 3210419ffa Update README.md 夏楚 2017-08-28 10:04:43 +0800
• a93628bd35 新增加aac不带adts头输入接口 xiongziliang 2017-08-24 09:54:25 +0800
• 965bc5d34f Update README.md 夏楚 2017-08-15 12:03:10 +0800
• 318ab7e29e Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit xiongziliang 2017-08-14 22:22:06 +0800
• 91ebb5db46 修正拼写错误 xiongziliang 2017-08-14 22:20:53 +0800
• 8ac1490585 支持windows 夏楚 2017-08-10 16:56:13 +0800
• 51eebe112e windows下添加telnet的支持 xiongziliang 2017-08-10 16:16:42 +0800
• 0d03ae6cd2 修正posix系统下编译失败的bug xiongziliang 2017-08-10 14:31:04 +0800
• d1a271c09d 修正posix系统下编译失败的bug xiongziliang 2017-08-10 14:18:59 +0800
• ec6edb5f24 修正posix系统下编译失败的bug xiongziliang 2017-08-10 14:06:51 +0800
• c13d18a352 update xiongziliang 2017-08-10 11:24:19 +0800
• a769d6c284 初步完成Windows下的移植 xiongziliang 2017-08-09 18:39:30 +0800
• a8b7d53f87 update xiongziliang 2017-08-03 14:59:22 +0800
• dd168e82f6 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit xiongziliang 2017-08-03 14:01:08 +0800
• afc36f5ef4 优化播放器接口 xiongziliang 2017-08-03 13:55:46 +0800
• b3309e3f2d 使能GOP缓存 xzl 2017-07-27 17:06:37 +0800
• fcfb434cf2 update xzl 2017-06-26 15:00:55 +0800
• 20344feec0 修改目标文件目录 xiongziliang 2017-06-20 14:37:09 +0800
• f3b5c8f75b 新增支持播发器画面秒开功能 xiongziliang 2017-06-20 11:46:17 +0800
• 24bbdb48cb Create .travis.yml 夏楚 2017-06-09 21:49:57 +0800
• 1d1182efd2 支持gcc4.7~gcc4.9 xiongziliang 2017-06-09 17:45:13 +0800
• 9cd016c9eb 修复设置Http头的bug xzl 2017-06-09 16:05:33 +0800
• f64dd5b4c7 Update README.md 夏楚 2017-06-06 20:15:08 +0800
• 8f847ffb78 添加Rtmp推流示例 xiongziliang 2017-06-06 20:08:59 +0800
• 568d8ad53f 添加Rtmp推流示例 xiongziliang 2017-06-06 20:06:31 +0800
• f3fe820234 Update README.md 夏楚 2017-06-05 18:13:49 +0800
• 0b83eddcbf Update README.md 夏楚 2017-06-05 18:10:17 +0800
• 13574a050c Update README.md 夏楚 2017-06-05 18:09:30 +0800
• cf57738fd4 Update README.md 夏楚 2017-06-05 18:08:31 +0800
• 6656fa0a61 Update README.md 夏楚 2017-06-05 18:03:27 +0800
• c85027b24c Update README.md 夏楚 2017-06-05 18:00:34 +0800
• 1445b29390 Update README.md 夏楚 2017-06-05 17:58:37 +0800
• d327a244b9 Update README.md 夏楚 2017-06-05 17:55:32 +0800
• c448c15d02 Update README.md 夏楚 2017-06-05 17:53:58 +0800
• 4906b988a4 Update README.md 夏楚 2017-06-03 11:14:27 +0800
• e165849c35 提供Android编译支持 xiongziliang 2017-06-03 10:52:49 +0800
• 72a6d2db61 修正计算sha256异常崩溃的bug xzl 2017-05-27 17:36:51 +0800
• 49ef6c4fc1 关闭多余的log xzl 2017-05-27 14:37:40 +0800
• 305f272344 修正rtmp时间戳的bug xzl 2017-05-27 14:37:19 +0800
• e3c1fb3648 调整rtmp 的音视频chunkID以及其他细节 xzl 2017-05-27 11:26:49 +0800
• c3231d2156 修正rtmp时间戳异常的bug xzl 2017-05-27 10:10:07 +0800
• 9a2d54ce9a 修正rtmp时间戳异常的bug xzl 2017-05-27 09:42:08 +0800
• a1742d41e9 update for Android xzl 2017-05-26 10:59:24 +0800
• f21f2ba7ac 适配Android xzl 2017-05-25 17:59:40 +0800
• f6e79584ce 适配Android xzl 2017-05-25 17:41:58 +0800
• ebf1c53543 http文件下载器改成默认不断点续传 xzl 2017-05-24 14:29:47 +0800
• 1b78f7ae5a 文件下载失败删除不完整文件 xzl 2017-05-24 09:56:54 +0800
• bc64460327 修正文件路径 xiongziliang 2017-05-23 16:48:33 +0800
• e92ad6b5b8 防止代理失败不重试的bug xzl 2017-05-18 16:25:36 +0800
• 9ef5a11579 添加对rtmp play2命令的支持 xzl 2017-05-18 16:24:36 +0800
• 6d28fff604 修复rtmp bodySize为0崩溃的bug xzl 2017-05-18 09:10:22 +0800
• afb90f68ed 解决有些rtmp流由于bodySize为0无法播放的问题 xiongziliang 2017-05-17 17:21:16 +0800
• c2d5f5abed 修正rtmp绝对时间戳的bug xiongziliang 2017-05-17 11:52:59 +0800
• e7837a19ad Update README.md 夏楚 2017-05-16 17:08:15 +0800
• ef3e0733b6 修复IOS编译不通过的bug xiongziliang 2017-05-16 16:49:03 +0800
• 71b4cffe50 解决rtsp转rtmp时间戳回环失步的问题 xiongziliang 2017-05-16 15:02:09 +0800
• df3d09219e 支持rtmp complex handshark xiongziliang 2017-05-16 11:51:18 +0800
• 2d71e5d353 支持rtmp complex handshark xiongziliang 2017-05-16 11:45:36 +0800
• acc6106f6e 适配flash player xiongziliang 2017-05-13 17:25:31 +0800
• c0477c897e 跟踪主线程 xzl 2017-05-13 10:28:55 +0800
• cce92ae29f 关闭log xzl 2017-05-12 16:10:48 +0800
• b9294c87cc 播放器统一在主线程析构 xzl 2017-05-12 16:10:30 +0800
• fd9df3f5cf 防止线程竞争的bug xzl 2017-05-12 13:59:58 +0800
• 53c2c92fb4 Update build_for_ios.sh 夏楚 2017-05-11 23:47:13 +0800
• 0d15f25364 Update build_for_linux.sh 夏楚 2017-05-11 23:45:51 +0800
• d644356c81 Update README.md 夏楚 2017-05-11 23:20:31 +0800
• 1dc81c5325 fixed xiongziliang 2017-05-11 23:10:30 +0800
• d8b38dbc60 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit fixed build liunx sh xiongziliang 2017-05-11 23:02:22 +0800
• ed062bd368 fixed xiongziliang 2017-05-11 23:00:53 +0800