Merge branch 'master' of https://github.com/OpenVisualCloud/Video-Sup…

…er-Resolution-Library.Enhanced-BasicVSR into refine-build
OpenVisualCloud · Dec 16, 2024 · ba4621e · ba4621e
2 parents 9075796 + aac5c4a
commit ba4621e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/docs/quick_try_manual_build.md b/docs/quick_try_manual_build.md
@@ -84,7 +84,7 @@ cd <workspace>/ivsr/ivsr_ffmpeg_plugin/ffmpeg
 git checkout n6.1
 
 # Apply patches
-cp -rf /path/to/patches/*.patch .
+cp -rf <workspace>/ivsr/ivsr_ffmpeg_plugin/patches/*.patch .
 git am --whitespace=fix *.patch
 
 ./configure \
@@ -173,4 +173,8 @@ make -j "$(nproc)"
 sudo make install
 # The setup_vars_opencv4.sh script sets up the environment variables required for OpenCV.
 cd ${OPENCV_BASE}/install/bin && bash ./setup_vars_opencv4.sh
+<<<<<<< HEAD
+=======
+
+>>>>>>> aac5c4a63b4cb9bae0a56e0cc481e4dab3265a7e
 ```