octo/yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: fix CI on Linux

Browse Source
This commit is contained in:
liushuyu
2021-12-12 18:28:52 -07:00
parent a2d73eaa10
commit dd72e4dce4
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.ci/scripts/windows/docker.sh
View File

@@ -41,12 +41,11 @@ for i in package/*.exe; do
done done
pip3 install pefile pip3 install pefile
python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/" python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/"
python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/"
# copy FFmpeg libraries # copy FFmpeg libraries
EXTERNALS_PATH="$(pwd)/build/externals" EXTERNALS_PATH="$(pwd)/build/externals"
FFMPEG_DLL_PATH="$(find ${EXTERNALS_PATH} -maxdepth 1 -type d | grep ffmpeg)/ffmpeg/bin" FFMPEG_DLL_PATH="$(find "${EXTERNALS_PATH}" -maxdepth 1 -type d | grep 'ffmpeg-')/bin"
find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';' find ${FFMPEG_DLL_PATH} -type f -regex ".*\.dll" -exec cp -v {} package/ ';'
# copy libraries from yuzu.exe path # copy libraries from yuzu.exe path

2
externals/ffmpeg/CMakeLists.txt vendored
View File

@@ -17,7 +17,7 @@ if (NOT WIN32)
endif() endif()
set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg/ffmpeg) set(FFmpeg_PREFIX ${PROJECT_SOURCE_DIR}/externals/ffmpeg/ffmpeg)
set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg) set(FFmpeg_BUILD_DIR ${PROJECT_BINARY_DIR}/externals/ffmpeg-build)
set(FFmpeg_MAKEFILE ${FFmpeg_BUILD_DIR}/Makefile) set(FFmpeg_MAKEFILE ${FFmpeg_BUILD_DIR}/Makefile)
make_directory(${FFmpeg_BUILD_DIR}) make_directory(${FFmpeg_BUILD_DIR})

3
src/video_core/command_classes/codecs/codec.cpp
View File

@@ -257,9 +257,6 @@ void Codec::Decode() {
final_frame->format = PREFERRED_GPU_FMT; final_frame->format = PREFERRED_GPU_FMT;
const int ret = av_hwframe_transfer_data(final_frame.get(), initial_frame.get(), 0); const int ret = av_hwframe_transfer_data(final_frame.get(), initial_frame.get(), 0);
ASSERT_MSG(!ret, "av_hwframe_transfer_data error {}", ret); ASSERT_MSG(!ret, "av_hwframe_transfer_data error {}", ret);
// null the hw frame context to prevent the buffer from being deleted
// and leaving a dangling reference in the av_codec_ctx
initial_frame->hw_frames_ctx = nullptr;
} else { } else {
final_frame = std::move(initial_frame); final_frame = std::move(initial_frame);
} }