Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ossrs/srs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: icevl/srs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 2, 2015

  1. Add "-copyts" to config

    copyts on;
    icevl committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    7208634 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2015

  1. Merge branch 'develop' of https://github.com/simple-rtmp-server/srs i…

    …nto origin/develop
    icevl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    9c7c0c4 View commit details
    Browse the repository at this point in the history
  2. add quotes to ffmpeg input

    icevl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    d5c274a View commit details
    Browse the repository at this point in the history
  3. fix std log path

    icevl committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    7910a6e View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2015

  1. fix conflicts

    icevl committed Nov 8, 2015
    Configuration menu
    Copy the full SHA
    f3edbb8 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. fix

    icevl committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    d5715ac View commit details
    Browse the repository at this point in the history
  2. Merge branch 'develop' of https://github.com/simple-rtmp-server/srs i…

    …nto origin/develop
    icevl committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    58c6dc3 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2015

  1. Merge branch 'develop' of https://github.com/simple-rtmp-server/srs i…

    …nto origin/develop
    icevl committed Nov 19, 2015
    Configuration menu
    Copy the full SHA
    5045728 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2015

  1. dvr_apply remove from config

    icevl committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    200a829 View commit details
    Browse the repository at this point in the history
  2. merge

    icevl committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    cc9a3ed View commit details
    Browse the repository at this point in the history
  3. merge

    icevl committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    766bdc6 View commit details
    Browse the repository at this point in the history
  4. end

    icevl committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    0dcaaaf View commit details
    Browse the repository at this point in the history
  5. restore dvr_apply

    icevl committed Nov 20, 2015
    Configuration menu
    Copy the full SHA
    a834b8a View commit details
    Browse the repository at this point in the history
Loading