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] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. #11277

Merged
merged 52 commits into from
Aug 18, 2020
Merged

[ffmpeg] Add feature support for zlib, iconv, fdk-aac, mp3lame, opus, soxr, theora. #11277

merged 52 commits into from
Aug 18, 2020

Commits on Jul 28, 2020

  1. [zlib] Fix unistd.h being required

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    5213bc8 View commit details
    Browse the repository at this point in the history

  2. [ffmpeg] Fix zlib. 

    Closes microsoft#7084
    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    8f5de7d View commit details
    Browse the repository at this point in the history

  3. [ffmpeg] Add iconv, fdk-aac, mp3lame, opus, soxr, theora support. 

    Closes microsoft#9671
    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    fbc0237 View commit details
    Browse the repository at this point in the history

  4. [ffmpeg] Add x265 support.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    32220e0 View commit details
    Browse the repository at this point in the history

  5. [ffmpeg] Fix zlib detection on linux

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    2f884e9 View commit details
    Browse the repository at this point in the history

  6. [libogg] Enable creation of pkg-config file

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    a8accec View commit details
    Browse the repository at this point in the history

  7. [ffmpeg] Add vorbis feature

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    fdc43ff View commit details
    Browse the repository at this point in the history

  8. [speex] Enable creation of pkg-config file

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    1709122 View commit details
    Browse the repository at this point in the history

  9. [ffmpeg] Add speex feature

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    06f0736 View commit details
    Browse the repository at this point in the history

  10. [ffmpeg] Add snappy feature

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    97cf69a View commit details
    Browse the repository at this point in the history

  11. [ffmpeg] Add wavpack feature

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    5919201 View commit details
    Browse the repository at this point in the history

  12. [ffmpeg] Fix linking to static dependencies using pkg-config

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    a4a6df7 View commit details
    Browse the repository at this point in the history

  13. [ffmpeg] Fix opencl detection on linux

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    28c664f View commit details
    Browse the repository at this point in the history

  14. [ffmpeg] Fix soxr linking on linux

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    f2416cb View commit details
    Browse the repository at this point in the history

  15. [ffmpeg] Fix FindFFmpeg.cmake 

    * Adds postproc to list of searched libs
* Adds missing windows dependency libs
* Fixes detection of seperate debug/release libs
    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    4992c67 View commit details
    Browse the repository at this point in the history

  16. [ffmpeg] Add optional dependencies to FindFFmpeg.cmake

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    d9c1675 View commit details
    Browse the repository at this point in the history

  17. [fdkaac] Correct header installation directory 

    This matches the installation directory used by the default fdkaac build scripts and is required for other existing projects attempting to find it.
    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    4e1ac0c View commit details
    Browse the repository at this point in the history

  18. [sdl2] Enable creation of pkg-config file on windows

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    fb36501 View commit details
    Browse the repository at this point in the history

  19. [ffmpeg] Add sdl2 feature

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    9c63f83 View commit details
    Browse the repository at this point in the history

  20. [ffmpeg] Fix detection of static mp3lame

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    56b9d8f View commit details
    Browse the repository at this point in the history

  21. [ffmpeg] Fix detection of static iconv

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    3cce5c3 View commit details
    Browse the repository at this point in the history

  22. [ffmpeg] Use newer libvpx package detection.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    d602039 View commit details
    Browse the repository at this point in the history

  23. [ffmpeg] Use newer zlib pkg-config detection.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    fddb5e3 View commit details
    Browse the repository at this point in the history

  24. [ffmpeg] Fix detection of 'prefix' in pkgconfig 

    Required to get current output from vcpkg_fixup_pkgconfig to work with ffmpegs configure script.
    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    6b889d5 View commit details
    Browse the repository at this point in the history

  25. [ffnvcodec] Use vcpkg_fixup_pkgconfig.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    688e905 View commit details
    Browse the repository at this point in the history

  26. [libogg] Use vcpkg_fixup_pkgconfig.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    31e5654 View commit details
    Browse the repository at this point in the history

  27. [sdl2] Correct pkgconfig debug suffix.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    5e35577 View commit details
    Browse the repository at this point in the history

  28. [speex] Use vcpkg_fixup_pkgconfig.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    f69cf7b View commit details
    Browse the repository at this point in the history

  29. [x265] Fix pkgconfig windows static lib naming.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    db76315 View commit details
    Browse the repository at this point in the history

  30. [wavpack] Fix pkgconfig windows dll naming.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    549d6b1 View commit details
    Browse the repository at this point in the history

  31. [ffnvcodec] Install pkgconfig file in debug.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    2efd01e View commit details
    Browse the repository at this point in the history

  32. [libvorbis] Fixup pkgconfig file.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    390d613 View commit details
    Browse the repository at this point in the history

  33. [opus] Use vcpkg_fixup_pkgconfig.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    e570891 View commit details
    Browse the repository at this point in the history

  34. [ffmpeg] Correctly set debug lib folder with pkgconfig.

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    d93c795 View commit details
    Browse the repository at this point in the history

  35. [vcpkg/scripts/pkgconfig] Add additional common definitions

    @Sibras
    Sibras committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    9184e8a View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2020

  1. Merge branch 'master' into master

    @Sibras
    Sibras authored Aug 2, 2020
    Configuration menu
    Copy the full SHA
    04b7b1c View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. [sdl2] Fix pkgconfig on osx.

    @Sibras
    Sibras committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    d25e73c View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. [ffmpeg] Correctly detect fdkac on linux. 

    Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
    @Sibras @PhoebeHui
    Sibras and PhoebeHui authored Aug 5, 2020
    Configuration menu
    Copy the full SHA
    7f4c4f6 View commit details
    Browse the repository at this point in the history

  2. [vcpkg/scripts/pkgconfig] Add iconv as system lib on osx.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    6cca774 View commit details
    Browse the repository at this point in the history

  3. [ffmpeg] Fix fdk detection on linux.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    4fbaba4 View commit details
    Browse the repository at this point in the history

  4. [ffmpeg] Fix x264 detection on linux.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    c0cf19e View commit details
    Browse the repository at this point in the history

  5. [ffmpeg] Fix x265 detection on linux.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    a721fdc View commit details
    Browse the repository at this point in the history

  6. [ffmpeg] Fix detection of OpenSSL 1.1.0+ on linux.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    289a0c4 View commit details
    Browse the repository at this point in the history

  7. [ffmpeg] Remove nvcodec dependency on cuda.

    @Sibras
    Sibras committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    87c7bf6 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2020

  1. [ffmpeg] Use WavPack instead of Wavpack in cmake. 

    Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
    @Sibras @PhoebeHui
    Sibras and PhoebeHui authored Aug 7, 2020
    Configuration menu
    Copy the full SHA
    84f4c65 View commit details
    Browse the repository at this point in the history

  2. [ffmpeg] Remove libnpp feature from nvcodec. 

    This feature is entirely unrelated and should be added in a new PR.
    @Sibras
    Sibras committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    dc4e432 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into master

    @Sibras
    Sibras authored Aug 7, 2020
    Configuration menu
    Copy the full SHA
    b225fbe View commit details
    Browse the repository at this point in the history

  4. [ffmpeg] Add comment about cuda options not requiring the cuda port a… 

    …s dependency.
    @Sibras
    Sibras committed Aug 7, 2020
    Configuration menu
    Copy the full SHA
    a280e11 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge remote-tracking branch 'upstream/master' into master

    @Sibras
    Sibras committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    8f71651 View commit details
    Browse the repository at this point in the history

  2. [ffmpeg] Fix static linking of wavpack on linux.

    @Sibras
    Sibras committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    5f3e768 View commit details
    Browse the repository at this point in the history

  3. [ffmpeg] Fix x265 detection when using numa on linux.

    @Sibras
    Sibras committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    f3f8d1e View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. Merge branch 'master' into master

    @Sibras
    Sibras authored Aug 15, 2020
    Configuration menu
    Copy the full SHA
    b199992 View commit details
    Browse the repository at this point in the history