Add new media ctor that accepts Uri

I have added a new constructor for Media that accepts a Uri. I also wrote a couple of test cases for it.

Note: On my machine, some tests failed. From what I have seen they are not related to this change.

Fixes #100 (closed) cc @mfkl

added 1 commit

• 68e13af4 - Make it clear that we need an absolute URI, not a relative one

Compare with previous version

@mfkl There seem to be merge conflicts. Unfortunately, I don't know how I can pull from upstream into my fork's 3.x. I tried the steps in the contributing guide but doesn't seem to work for me:

git pull upstream master
fatal: 'upstream' does not appear to be a git repository
fatal: Could not read from remote repository.

Please make sure you have the correct access rights

Do you want me to delete the fork and the PR and fork again? Or is there any other way. I don't mind doing it but I want to learn the whole process better.

So I think you create a merge request before updating the upstream ref.

First make sure you have 2 remote repositories to pull from in your conf, your fork and upstream.

See https://help.github.com/en/github/using-git/adding-a-remote on how to add a remote. Once you have added upstream, pull its 3.x branch. Then you can rebase your media-uri-ctor branch onto your the newly updated 3.x branch.

I tried the steps in the contributing guide but doesn't seem to work for me

I guess it needs some updating then. We'll get to that with your help when we manage to make it work for you.

On my machine, some tests failed. From what I have seen they are not related to this change.

Yes, this is highly possible. Ignore the other tests, I'll have a look.

added 26 commits

• 68e13af4...ff246a39 - 22 commits from branch videolan:3.x
• fc0b8168 - add a constructor to Media that accepts a Uri
• f5e46141 - add test cases
• 50dcc5f1 - Make it clear that we need an absolute URI, not a relative one
• 70172e84 - Merge branch 'media-uri-ctor' of...

Compare with previous version

closed

mentioned in merge request !12 (merged)