Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

database-and-api merge latest dev changes and misc fixes #252

Merged
merged 59 commits into from
Jun 6, 2019

Conversation

handsomematt
Copy link
Collaborator

The database-and-api fork is hard to begin contributing to due to the staleness, in this PR I have rebased and resolved merge conflicts from the dev branch into the database-and-api branch.

Main things include:

  • Modernize golang dev environment Modernize golang dev environment #249
  • Updated squirrel dependency from gopkg to github thanks to modernized Go modules.
  • replace satori/go.uuid with gofrs/uuid (satori/go.uuid is unmaintained and errored)

With these changes you can build the repo very simply:

$ git clone https://github.com/tellytv/telly -b database-and-api
$ cd telly
$ go build .

Hopefully with these changes fast forwarded myself and others are able to contribute to database-and-api branch far easier.

chazlarson and others added 30 commits August 24, 2018 20:26
Remove the  "-bsf:v", "h264_mp4toannexb" to fix HEVC streams.
Specifically state not to change the magic provider names.
They don't make sense, but cest la vie.
Add a reference to specific version.
tmm1 and others added 26 commits May 6, 2019 10:53
Use friendly name directly
Removed references to the late, lamented Vader Streams.
-tune is an encoding option. when passing -codec copy,
no encoding is happening so that option is not used.

since there is no encoding or decoding happening, it is
incorrect to state that ffmpeg is transcoding.
Modernize golang dev environment
fix version number configuration to be compatible with go modules
…tv#238)

* m3uplus parser: support UDP streams.

* Allow customers using the custom provider to use udpxy as a multicast proxy.
gopkg was previously used to lock the version, this is now done correctly in Go 1.6 by cloning the Github default branch
satori/go.uuid is no longer maintained
@robbiet480 robbiet480 merged commit e7b08c5 into tellytv:database-and-api Jun 6, 2019
@handsomematt handsomematt deleted the database-and-api-ff branch June 11, 2019 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants