diff options
| author | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-29 18:15:57 +0200 |
|---|---|---|
| committer | fritsch <Peter.Fruehberger@gmail.com> | 2016-03-31 10:50:58 +0200 |
| commit | 378eb2687c1da5f97ef47c78431033b52f0d4417 (patch) | |
| tree | 196b5f454f57dc6bf432d52012dcf2f52f09cc7c /project | |
| parent | 4ab88763e6606b2d7a7cbc08752359c43d825e74 (diff) | |
FFmpeg: Replace libdcadec with internal hd aware dca decoder
Diffstat (limited to 'project')
| -rw-r--r-- | project/BuildDependencies/DownloadMingwBuildEnv.bat | 2 | ||||
| -rw-r--r-- | project/cmake/modules/FindFFMPEG.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat index 2247d0f22d..616c718010 100644 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ b/project/BuildDependencies/DownloadMingwBuildEnv.bat @@ -28,7 +28,7 @@ set build32=yes set build64=no set instdir=%CD% set msyspackages=autoconf automake libtool m4 make gettext patch pkg-config wget p7zip coreutils -set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm dcadec nettle libtasn1 openssl +set mingwpackages=dlfcn gcc gcc-libs gettext libiconv libgpg-error libpng yasm nettle libtasn1 openssl set locals32=gnutls-3.4.9-static set locals64=gnutls-3.4.9-static set usemirror=yes diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake index 711845ad8b..710423176d 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake @@ -54,8 +54,7 @@ then swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` vorbisenc=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors vorbisenc` - dcadec=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors dcadec` - $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc $dcadec + $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc else $@ fi") |