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.

Sign up for GitHub

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

Jump to bottom

ffmpeg: 4.2.3 -> 4.3 #90541

Merged
merged 3 commits into from Jun 18, 2020
Merged

ffmpeg: 4.2.3 -> 4.3 #90541

merged 3 commits into from Jun 18, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Jun 15, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from codyopel and MP2E June 15, 2020 23:18
@zowoq
Copy link
Contributor Author

zowoq commented Jun 16, 2020

@ofborg build handbrake mpv-unwrapped mpv
@ofborg test handbrake

@zowoq zowoq requested a review from primeos June 16, 2020 05:35
primeos
primeos approved these changes Jun 16, 2020
View reviewed changes
Copy link
Member

@primeos primeos left a comment

Choose a reason for hiding this comment

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

I didn't test anything but the diff LGTM and prefer-libdav1d-over-libaom.patch is indeed not required anymore as this is already the new default in FFmpeg 4.3.

@zowoq zowoq marked this pull request as draft June 17, 2020 06:02
@pwetzel
Copy link
Contributor

pwetzel commented Jun 18, 2020

Built this and obs-studio on top of it, tested OK.

@zowoq zowoq marked this pull request as ready for review June 18, 2020 04:56
@zowoq
Copy link
Contributor Author

zowoq commented Jun 18, 2020 •
edited

I looked at adding rav1e to ffmpeg but it seems to need a cargo tool that isn't packaged in nixpkgs yet.

@zowoq zowoq changed the base branch from master to staging June 18, 2020 04:57
@primeos primeos mentioned this pull request Jun 18, 2020
Merged
10 tasks
@primeos
Copy link
Member

primeos commented Jun 18, 2020

@zowoq rav1e support would be cool :) I just drafted #91050 so we can add that support later (shouldn't delay this PR).

@zowoq zowoq merged commit 3e0b8c5 into NixOS:staging Jun 18, 2020
@zowoq zowoq deleted the ffmpeg43 branch June 18, 2020 23:32
@zowoq zowoq restored the ffmpeg43 branch June 26, 2020 06:20
@zowoq zowoq deleted the ffmpeg43 branch June 26, 2020 06:20
@zowoq zowoq restored the ffmpeg43 branch June 26, 2020 06:20
@zowoq zowoq deleted the ffmpeg43 branch June 26, 2020 06:20
@vbgl vbgl mentioned this pull request Sep 6, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@primeos primeos primeos approved these changes

@codyopel codyopel Awaiting requested review from codyopel

@MP2E MP2E Awaiting requested review from MP2E

Assignees
No one assigned
Labels
10.rebuild-darwin: 101-500 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zowoq @pwetzel @primeos