liushuyu
4 years ago
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
3 changed files with
3 additions and
7 deletions
-
.ci/scripts/windows/docker.sh
-
externals/ffmpeg/CMakeLists.txt
-
src/video_core/command_classes/codecs/codec.cpp
|
|
|
@ -41,12 +41,11 @@ for i in package/*.exe; do |
|
|
|
done |
|
|
|
|
|
|
|
pip3 install pefile |
|
|
|
python3 .ci/scripts/windows/scan_dll.py package/*.exe "package/" |
|
|
|
python3 .ci/scripts/windows/scan_dll.py package/imageformats/*.dll "package/" |
|
|
|
python3 .ci/scripts/windows/scan_dll.py package/*.exe package/imageformats/*.dll "package/" |
|
|
|
|
|
|
|
# copy FFmpeg libraries |
|
|
|
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/ ';' |
|
|
|
|
|
|
|
# copy libraries from yuzu.exe path |
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ if (NOT WIN32) |
|
|
|
endif() |
|
|
|
|
|
|
|
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) |
|
|
|
make_directory(${FFmpeg_BUILD_DIR}) |
|
|
|
|
|
|
|
|
|
|
|
@ -257,9 +257,6 @@ void Codec::Decode() { |
|
|
|
final_frame->format = PREFERRED_GPU_FMT; |
|
|
|
const int ret = av_hwframe_transfer_data(final_frame.get(), initial_frame.get(), 0); |
|
|
|
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 { |
|
|
|
final_frame = std::move(initial_frame); |
|
|
|
} |
|
|
|
|