File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -231,7 +231,7 @@ function to_key {
231231 opus)
232232 echo 12
233233 ;;
234- x265 )
234+ x265_git )
235235 echo 13
236236 ;;
237237 nv-codec-headers)
@@ -469,7 +469,7 @@ function set_globals {
469469 SUBDIRS=" x264 $SUBDIRS "
470470 fi
471471 if test " $FFMPEG_SUPPORT_H265 " = 1 && test " $X265_HEAD " = 1 -o " $X265_REVISION " ! = " " ; then
472- SUBDIRS=" x265 $SUBDIRS "
472+ SUBDIRS=" x265_git $SUBDIRS "
473473 fi
474474 if test " $FFMPEG_SUPPORT_LIBVPX " = 1 && test " $LIBVPX_HEAD " = 1 -o " $LIBVPX_REVISION " ! = " " ; then
475475 SUBDIRS=" libvpx $SUBDIRS "
@@ -1619,7 +1619,7 @@ function configure_compile_install_subproject {
16191619 # CMake identifies the dylibs with an @rpath that breaks our recursive bundling process.
16201620 # These names need to changed immediately after each lib is installed so that dependants
16211621 # link using the full name, and the bundling process can locate the dependency.
1622- if [ " aom" = " $1 " -o " x265 " = " $1 " ]; then
1622+ if [ " aom" = " $1 " -o " x265_git " = " $1 " ]; then
16231623 replace_rpath $1
16241624 elif [ " mlt" = " $1 " ]; then
16251625 replace_rpath mlt-7
You can’t perform that action at this time.
0 commit comments