Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 50e84b4

Browse filesBrowse files
authored
Merge pull request markus-perl#41 from mliradelc/master
FFMPEG 4.3 | NV codec headers 10.0.26.0
2 parents b51cb98 + 48223fc commit 50e84b4
Copy full SHA for 50e84b4

File tree

Expand file treeCollapse file tree

1 file changed

+6
-6
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+6
-6
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -371,20 +371,20 @@ CFLAGS="-I$WORKSPACE/include"
371371
LDFLAGS="-L$WORKSPACE/lib"
372372
if command -v nvcc > /dev/null ; then
373373
if build "nv-codec"; then
374-
download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n9.1.23.0/nv-codec-headers-9.1.23.0.tar.gz" "nv-codec-headers-9.1.23.0.tar.gz"
375-
cd "$PACKAGES"/nv-codec-headers-n9.1.23.0 || exit
376-
sed -i "s#PREFIX = /usr/local#PREFIX = ${WORKSPACE}#g" "$PACKAGES"/nv-codec-headers-n9.1.23.0/Makefile
374+
download "https://github.com/FFmpeg/nv-codec-headers/releases/download/n10.0.26.0/nv-codec-headers-10.0.26.0.tar.gz" "nv-codec-headers-10.0.26.0.tar.gz"
375+
cd "$PACKAGES"/nv-codec-headers-10.0.26.0 || exit
376+
sed -i "s#PREFIX = /usr/local#PREFIX = ${WORKSPACE}#g" "$PACKAGES"/nv-codec-headers-10.0.26.0/Makefile
377377
execute make install
378378
build_done "nv-codec"
379379
fi
380380
CFLAGS="$CFLAGS -I/usr/local/cuda/include"
381381
LDFLAGS="$LDFLAGS -L/usr/local/cuda/lib64"
382-
ADDITIONAL_CONFIGURE_OPTIONS="$ADDITIONAL_CONFIGURE_OPTIONS --enable-cuda-nvcc --enable-cuvid --enable-nvenc --enable-libnpp"
382+
ADDITIONAL_CONFIGURE_OPTIONS="$ADDITIONAL_CONFIGURE_OPTIONS --enable-cuda-nvcc --enable-cuvid --enable-nvenc --enable-libnpp --enable-cuda-llvm"
383383
fi
384384

385385
build "ffmpeg"
386-
download "https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/192d1d34eb3668fa27f433e96036340e1e5077a0.tar.gz" "ffmpeg-snapshot.tar.bz2"
387-
cd "$PACKAGES"/ffmpeg-192d1d3/ || exit
386+
download "https://github.com/FFmpeg/FFmpeg/archive/n4.3.tar.gz" "ffmpeg-4.3.tar.bz2"
387+
cd "$PACKAGES"/FFmpeg-n4.3/ || exit
388388
# shellcheck disable=SC2086
389389
./configure $ADDITIONAL_CONFIGURE_OPTIONS \
390390
--pkgconfigdir="$WORKSPACE/lib/pkgconfig" \

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.