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.

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

Nvidia and other fixes #200

Merged
merged 6 commits into from
Jun 27, 2023
Merged

Nvidia and other fixes #200

merged 6 commits into from
Jun 27, 2023

Conversation

jtbr
Copy link
Contributor

@jtbr jtbr commented Jun 13, 2023

This PR fixes nvidia hwaccel compilation. nv-codec-headers need pkgconfig files installed the same place as other libs. Need --enable-nvdec and --enable-ffnvcodec to build all. (fixes #183, #187)

Works around the git ffmpeg version bug #197 and #104. https://github.com/FFmpeg/FFmpeg/blob/master/ffbuild/version.sh#L6
It

Adds --small option. This makes --enable-small ffmpeg config option not the default and disables building manpages. Including this option optimizes ffmpeg executable size rather than speed. It also removes certain metadata, like the descriptions of the codecs (ie, ffmpeg -codecs gives only the name with this option enabled). IMHO, this should not be the default, but this option makes it possible anyway.

Makes the install folder under linux ~/.local if it exists, /usr/local if it exists, and /usr only if neither does. The first two are preferred because they will not overwrite the system packages if installed, but will become the new default ffmpeg on a properly configured machine.

Installs the manpages (except if they are not built, with option --small). Consolidates the install code so it isn't written twice. Only uses sudo if installing to a system path.

Updates documentation for user-facing changes.

Tested in Linux Mint 21.1 (based on Ubuntu 20.04).

jtbr added 6 commits June 13, 2023 13:56
install manpages when built, use sudo only when needed,
workaround ffmpeg version build due to .git dir,
use local rather than system installation directories if they exist
Put --small before --static in the --help
@jtbr
Copy link
Contributor Author

jtbr commented Jun 21, 2023

I updated the readme, in an effort to make clear the optional dependencies that are needed to install all the codecs and filters, and how to install them. In doing so it helped to re-organize somewhat, putting general build instructions before docker build instructions, and including the Usage before the general (common) build instructions.

@markus-perl
Copy link
Owner

Thx, for your work. I will check it asap.

@markus-perl markus-perl merged commit 0f531da into markus-perl:master Jun 27, 2023
@zCri
Copy link

zCri commented Jun 27, 2023

I was just having issues building ffmpeg with nvenc, hopefully this works

@jtbr jtbr deleted the nvidia-fixes branch July 4, 2023 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ubuntu22.04 ERROR: cuvid requested, but not all dependencies are satisfied: ffnvcodec
3 participants