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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 856df0e07454
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 42b71b220e51
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 6, 2018

  1. opencv3: fix enableFfmpeg on darwin 

    The VideoDecodeAcceleration framework and bzip2 library are needed
when enableFfmpeg is set to true on darwin.
    @acowley
    acowley committed Jan 6, 2018
    Copy the full SHA
    8e84172 View commit details

  2. Merge pull request #33502 from acowley/opencv-darwin-ffmpeg 

    opencv3: fix enableFfmpeg on darwin
    @orivej
    orivej authored Jan 6, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    42b71b2 View commit details
Loading