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

• 9b52300cca Update .travis.yml 夏楚 2017-05-11 22:57:26 +0800
• 42c26e6201 添加编译脚本 xiongziliang 2017-05-11 22:55:29 +0800
• d619296fe5 精简 xiongziliang 2017-05-11 22:10:12 +0800
• a4233bdeb8 添加对mac的支持 xiongziliang 2017-05-11 18:03:06 +0800
• 1a6840d3be fix bug in mac xiongziliang 2017-05-11 17:09:00 +0800
• d486ad9db2 添加说明 xzl 2017-05-11 11:27:01 +0800
• 821d693f32 添加海康IPC的接入源码 xzl 2017-05-11 11:26:45 +0800
• 4b48a24ad9 修复一个rtmp播放器跨线程操作的bug xzl 2017-05-11 11:06:34 +0800
• 60590c1de7 添加读写配置文件 xzl 2017-05-09 16:52:31 +0800
• 8db012775b regist rtmp after all is ready xzl 2017-05-09 16:40:42 +0800
• 5eefeca430 添加性能测试用例 xzl 2017-05-09 10:45:55 +0800
• a7f438d84f 加大tpc会话限制数量 xzl 2017-05-09 10:45:29 +0800
• b646355545 添加播放器测试程序 xzl 2017-05-08 18:03:43 +0800
• e5621efc92 Update README.md 夏楚 2017-05-06 00:07:32 +0800
• 55a4c63cfa 添加http客户端测试代码 xiongziliang 2017-05-05 23:54:59 +0800
• ca54cb9d31 解决断点续传返回416的问题 xiongziliang 2017-05-05 23:54:30 +0800
• ae4c724005 add debug log xiongziliang 2017-05-05 23:53:09 +0800
• a994e075b4 add test for telnet xiongziliang 2017-05-05 21:29:44 +0800
• 56078f3ba0 add method for add user xiongziliang 2017-05-05 21:29:12 +0800
• e91525e96e 添加不区分大小写的map xiongziliang 2017-05-05 18:04:23 +0800
• 6a411da024 add api for ini file xiongziliang 2017-05-05 18:03:23 +0800
• f1a41022cb add http client xiongziliang 2017-05-05 18:02:54 +0800
• 5901ff197d 修复rtp组播的bug xiongziliang 2017-05-04 09:47:02 +0800
• b2e650f9f6 Update README.md 夏楚 2017-05-03 00:16:53 +0800
• 3fa3f1e46d update xiongziliang 2017-05-03 00:12:51 +0800
• d27f7107e1 fix bug in clang++ xiongziliang 2017-05-03 00:05:30 +0800
• 4490fe6863 Update README.md 夏楚 2017-05-03 00:03:48 +0800
• 22f79f475b Update README.md 夏楚 2017-05-03 00:02:02 +0800
• f8d67ae38f Update README.md 夏楚 2017-05-03 00:00:15 +0800
• 8ac681682c update xiongziliang 2017-05-02 23:48:37 +0800
• 3e68360cea rm x64 folder xiongziliang 2017-05-02 23:44:03 +0800
• d014ba12a2 add yml file xiongziliang 2017-05-02 23:43:33 +0800
• 74d3a75bbb add test for multi server xiongziliang 2017-05-02 23:43:10 +0800
• 777bd95358 move cmake file xiongziliang 2017-05-02 23:42:35 +0800
• 06e7f93ff0 add cmake file xiongziliang 2017-05-02 18:10:47 +0800
• 4a021e17bc 调整目录结构 xiongziliang 2017-05-02 17:15:12 +0800
• 08387d5836 update xiongziliang 2017-05-02 17:09:25 +0800
• 7d73f44c73 mv to Common folder xiongziliang 2017-05-02 17:08:57 +0800
• f178bfede3 update xiongziliang 2017-05-02 17:07:32 +0800
• bf9b575569 ENABLE_MEDIAFILE宏拆分为ENABLE_HLS和ENABLE_MP4V2 xiongziliang 2017-05-02 17:07:02 +0800
• 810bb71e21 fix MedaiFile to MediaFile xiongziliang 2017-05-02 16:34:25 +0800
• b74028de64 fix MedaiFile to MediaFile xiongziliang 2017-05-02 16:33:49 +0800
• d5726d95aa update xiongziliang 2017-05-02 13:44:42 +0800
• d7d90b3e0a add makefle xiongziliang 2017-05-02 13:44:23 +0800
• 0eb82e4627 整理代码 xiongzilaing 2017-04-25 11:35:41 +0800
• 5ae69f6e57 Update README.md xiongziliang 2017-04-23 14:48:54 +0800
• 2bc89d07a7 Update README.md xiongziliang 2017-04-22 23:37:07 +0800
• 0c2d38aafb update for how to make xiongziliang 2017-04-22 22:57:43 +0800
• c8577169d9 update xiongziliang 2017-04-22 22:52:29 +0800
• 7c9b52572e update xiongziliang 2017-04-22 21:48:02 +0800
• c628def253 update xiongziliang 2017-04-22 21:47:03 +0800
• 99511f33ab update xiongziliang 2017-04-22 21:45:58 +0800
• 9962dc4191 添加媒体源demo xzl 2017-04-20 11:56:31 +0800
• 6ff60dd56e 新增Https支持 xzl 2017-04-19 17:47:07 +0800
• 52e25fc08c 添加打印log xzl 2017-04-18 14:43:04 +0800
• 84da660754 更该配置项名称 xzl 2017-04-13 17:38:25 +0800
• e2ce16c70b Http服务改成异步回复模式 xzl 2017-04-10 17:24:06 +0800
• f71a32bc8c 测试用例 xiongziliang 2017-04-05 09:39:16 +0800
• f21a367d92 Merge branch 'master' of https://github.com/xiongziliang/ZLMediaKit.git xzl 2017-04-01 16:47:03 +0800
• 79ef1e727b 删除生成文件 xzl 2017-04-01 16:45:53 +0800
• 1d9f56b6c2 Update README.md xiongziliang 2017-04-01 16:43:10 +0800
• 4d647d4846 Update README.md xiongziliang 2017-04-01 16:42:00 +0800
• 26a85aa8dc Update README.md xiongziliang 2017-04-01 16:41:09 +0800
• 3f73024a9b 初始提交 xzl 2017-04-01 16:35:56 +0800
• aef0ecbcb9 Initial commit xiongziliang 2017-04-01 16:30:26 +0800