Skip to content

- Fixing broken URL to mp4ra website#17473

Merged
alalek merged 2 commits intoopencv:3.4from
f3rm4rf3r:fixingFourCCDocBrokenLink
Jun 4, 2020
Merged

- Fixing broken URL to mp4ra website#17473
alalek merged 2 commits intoopencv:3.4from
f3rm4rf3r:fixingFourCCDocBrokenLink

Conversation

@f3rm4rf3r
Copy link
Copy Markdown
Contributor

@f3rm4rf3r f3rm4rf3r commented Jun 4, 2020

This fixes a broken link in the documentation (no functionality change) to the mp4ra website within the fourcc section.

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 4, 2020

Thank you for contribution!

As a bugfix this patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 4, 2020

Please fix similar link in videoio_c.h too.

@f3rm4rf3r f3rm4rf3r force-pushed the fixingFourCCDocBrokenLink branch from 99abe6f to 3cfeb57 Compare June 4, 2020 15:13
@f3rm4rf3r f3rm4rf3r changed the base branch from master to 3.4 June 4, 2020 15:13
@f3rm4rf3r
Copy link
Copy Markdown
Contributor Author

f3rm4rf3r commented Jun 4, 2020

Please fix similar link in videoio_c.h too.

Updated and changed to PR to 3.4

alalek
alalek approved these changes Jun 4, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@alalek alalek merged commit cb0f74a into opencv:3.4 Jun 4, 2020
@alalek alalek mentioned this pull request Jun 4, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

bug category: documentation Documentation fix or update category: videoio

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

2 participants

@f3rm4rf3r @alalek