diff --git a/thirdparty/FFmpeg-ff4.0/HPKBUILD b/thirdparty/FFmpeg-ff4.0/HPKBUILD index 81acef5dca137ce7d814873756dd5b3239de0fb1..2fa05e5b50c9697e0eac5d74b285a78d2f63dd2a 100644 --- a/thirdparty/FFmpeg-ff4.0/HPKBUILD +++ b/thirdparty/FFmpeg-ff4.0/HPKBUILD @@ -7,7 +7,7 @@ pkgdesc="FFmpeg is a collection of libraries and tools to process multimedia con url="https://github.com/bilibili/FFmpeg/" archs=("armeabi-v7a" "arm64-v8a" "x86_64") license=("GPL2 or later" "LGPL2.1 or later" "MIT" "X11" "BSD-styl") -depends=("openssl_1_1_1w") +depends=("openssl_1_1_1w" "openh264") makedepends=() source="https://github.com/bilibili/FFmpeg/archive/refs/tags/ff4.0--ijk0.8.8--20210426--001.tar.gz" @@ -62,7 +62,7 @@ prepare() { build() { cd $pkgname-$ARCH-build/$builddir PKG_CONFIG_LIBDIR="${pkgconfigpath}" ./configure "$@" --enable-neon --enable-asm --enable-network \ - --enable-cross-compile --disable-x86asm --enable-openssl --enable-protocols \ + --enable-cross-compile --disable-x86asm --enable-openssl --enable-protocols --enable-libopenh264 \ --disable-programs --enable-static --disable-shared --disable-doc --disable-htmlpages --target-os=linux --arch=$arch \ --cc=${CC} --ld=${CC} --strip=${STRIP} --sysroot=${OHOS_SDK}/native/sysroot > $buildlog 2>&1 $MAKE >> $buildlog 2>&1 diff --git a/thirdparty/FFmpeg-ff4.0/README_zh.md b/thirdparty/FFmpeg-ff4.0/README_zh.md index 4b172bba582a498bc0bfdca6b3676d7fdf95ada9..31a175ddcc61557ca485cf7d42dd7cf6636f5953 100755 --- a/thirdparty/FFmpeg-ff4.0/README_zh.md +++ b/thirdparty/FFmpeg-ff4.0/README_zh.md @@ -56,7 +56,8 @@ target_link_libraries(ijkplayer PUBLIC swscale) target_link_libraries(ijkplayer PUBLIC avdevice) target_link_libraries(ijkplayer PUBLIC crypto) target_link_libraries(ijkplayer PUBLIC ssl) -target_link_directories(ijkplayer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openssl/${OHOS_ARCH}/lib) +target_link_libraries(ijkplayer PUBLIC openh264) +target_link_directories(ijkplayer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openssl/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openh264/${OHOS_ARCH}/lib) ``` ``` @@ -74,7 +75,8 @@ target_link_libraries(ijksdl PUBLIC swscale) target_link_libraries(ijksdl PUBLIC avdevice) target_link_libraries(ijksdl PUBLIC crypto) target_link_libraries(ijksdl PUBLIC ssl) -target_link_directories(ijksdl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openssl/${OHOS_ARCH}/lib) +target_link_libraries(ijksdl PUBLIC openh264) +target_link_directories(ijksdl PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/ffmpeg/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openssl/${OHOS_ARCH}/lib ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/openh264/${OHOS_ARCH}/lib) ``` ``` diff --git a/thirdparty/FFmpeg-ff4.0/pic/dir.png b/thirdparty/FFmpeg-ff4.0/pic/dir.png index 8ba8295e07259b86ad6a57ce5a88905ce9806bdc..5f99e69cad97ee3952629484149f4b606bba688c 100755 Binary files a/thirdparty/FFmpeg-ff4.0/pic/dir.png and b/thirdparty/FFmpeg-ff4.0/pic/dir.png differ