Code

some commits#2169

Code

Closed

duiniuluantanqin wants to merge 31 commits intoossrs:developossrs/srs:developfrom duiniuluantanqin:developduiniuluantanqin/srs:developCopy head branch name to clipboard

+1,342-409

Commits

Commits on Jan 22, 2021

• Merge pull request #6 from ossrs/develop

  Show description for 0ed02e3
  duiniuluantanqin

  authored
  0ed02e3

  Copy full SHA for 0ed02e3

Commits on Jan 25, 2021

• add statistic info for webrtc play

  

  chenhaibo

  committed
  361f24c

  Copy full SHA for 361f24c

Commits on Jan 27, 2021

• add gitignore

  

  chenhaibo

  committed
  871b463

  Copy full SHA for 871b463

• 上传vs工程

  

  chenhaibo

  committed
  5cb9019

  Copy full SHA for 5cb9019

Commits on Jan 28, 2021

• add kbps statistic for webrtc play

  

  chenhaibo

  committed
  2b2b6c1

  Copy full SHA for 2b2b6c1

Commits on Feb 4, 2021

• add statistic info for webrtc publish

  

  chenhaibo

  committed
  1d0679d

  Copy full SHA for 1d0679d

• make -j8

  

  chenhaibo

  committed
  7c68834

  Copy full SHA for 7c68834

• Merge branch 'develop' into develop

  duiniuluantanqin

  authored
  45a334d

  Copy full SHA for 45a334d

Commits on Apr 15, 2021

• clean up inactived stream in statistic

  

  chenhaibo

  committed
  d286091

  Copy full SHA for d286091

Commits on Apr 21, 2021

• merge

  

  chenhaibo

  committed
  1b768cc

  Copy full SHA for 1b768cc

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  5f1493c

  Copy full SHA for 5f1493c

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  4b85417

  Copy full SHA for 4b85417

Commits on Apr 28, 2021

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  eae6e33

  Copy full SHA for eae6e33

• fix merge bug

  

  chenhaibo

  committed
  a98d60f

  Copy full SHA for a98d60f

Commits on Apr 29, 2021

• vs setting

  

  chenhaibo

  committed
  da9b2df

  Copy full SHA for da9b2df

• add class SrsHttpHooksController;

  Show description for d4c145e
  

  chenhaibo

  committed
  d4c145e

  Copy full SHA for d4c145e

• add function expire in class SrsRtcConnection, for kick-off

  

  chenhaibo

  committed
  340c066

  Copy full SHA for 340c066

Commits on May 6, 2021

• merge

  

  chenhaibo

  committed
  968ab17

  Copy full SHA for 968ab17

Commits on May 8, 2021

• fix bug // @see ossrs#2311

  

  chenhaibo

  committed
  497c2d5

  Copy full SHA for 497c2d5

Commits on May 10, 2021

• support for mutiple sps/pps parsing

  

  chenhaibo

  committed
  a0c09d8

  Copy full SHA for a0c09d8

Commits on May 11, 2021

• fix this commit bug (ossrs@497c2d5)

  

  chenhaibo

  committed
  6689d88

  Copy full SHA for 6689d88

Commits on May 12, 2021

• merge and resolve conflict

  

  chenhaibo

  committed
  fec44ba

  Copy full SHA for fec44ba

Commits on May 14, 2021

• fix bug //@see ossrs#2311

  

  chenhaibo

  committed
  d5b28ad

  Copy full SHA for d5b28ad

Commits on May 17, 2021

• merge

  

  chenhaibo

  committed
  c57cbfa

  Copy full SHA for c57cbfa

• fix compile error

  

  chenhaibo

  committed
  e03ce10

  Copy full SHA for e03ce10

Commits on May 18, 2021

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  7c8f728

  Copy full SHA for 7c8f728

Commits on May 20, 2021

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  a3afa9f

  Copy full SHA for a3afa9f

Commits on May 21, 2021

• fix bug

  

  chenhaibo

  committed
  77c27ff

  Copy full SHA for 77c27ff

Commits on May 24, 2021

• merge

  

  chenhaibo

  committed
  ca8e1bf

  Copy full SHA for ca8e1bf

Commits on Jun 8, 2021

• 同步

  

  chenhaibo

  committed
  7442319

  Copy full SHA for 7442319

Commits on Jun 21, 2021

• Merge branch 'develop' of https://github.com/ossrs/srs into srs_pr

  

  chenhaibo

  committed
  6355038

  Copy full SHA for 6355038