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: NixOS/nixpkgs
base: 5dff8e981887
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5236232eea9a
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on May 11, 2019

  1. ffmpeg-full: nvenc doesn't imply nonfree licensing 

    (cherry picked from commit ce211e6)
    @jacereda @vcunat
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    de5e115 View commit details
    Browse the repository at this point in the history

  2. nvenc: remove obsolete nvidia-video-sdk 

    (cherry picked from commit b869a42)
    @jacereda @vcunat
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    f96ce31 View commit details
    Browse the repository at this point in the history

  3. nv-codec-headers: fix license 

    (cherry picked from commit 65c52e1)
    @jacereda @vcunat
    jacereda authored and vcunat committed May 11, 2019
    Copy the full SHA
    9efdc75 View commit details
    Browse the repository at this point in the history

  4. Merge ffmpeg-full: nvenc doesn't imply nonfree licensing 

    It's a port of #55442 to master.
    @vcunat
    vcunat committed May 11, 2019
    Copy the full SHA
    b1565e5 View commit details
    Browse the repository at this point in the history

  5. ffmpeg-full: enable nvenc by default 

    It's called "full", after all, and nvenc seem quite cheap actually.
Also remove an unused parameter.
    @vcunat
    vcunat committed May 11, 2019
    Copy the full SHA
    9fda860 View commit details
    Browse the repository at this point in the history

  6. ffmpeg-full: fix the build phase 

    I was surprised the build is so slow, and I see it's single-threaded
due to all work being done in install phase :-/
Please, do *not* rewrite phases unless you're really confident it's
a good approach; typically postFoo and preFoo is much better.

I considered filing this ffmpeg-related string of changes as a PR,
but in the end it doesn't seem likely to need review and we have too
many PRs as it is...
    @vcunat
    vcunat committed May 11, 2019
    Copy the full SHA
    5236232 View commit details
    Browse the repository at this point in the history