diff options
Diffstat (limited to 'tools/depends/target/ffmpeg')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/depends/target/ffmpeg/Makefile | 1 | ||||
| -rwxr-xr-x | tools/depends/target/ffmpeg/autobuild.sh | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index a061fd5a76..6e804024d4 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -16,8 +16,7 @@ if(CROSSCOMPILING) endif() if(CORE_SYSTEM_NAME STREQUAL linux) - list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi - --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis) + list(APPEND ffmpeg_conf --enable-vdpau --enable-vaapi) elseif(CORE_SYSTEM_NAME STREQUAL android) if(CPU MATCHES arm) list(APPEND ffmpeg_conf --cpu=cortex-a9) diff --git a/tools/depends/target/ffmpeg/Makefile b/tools/depends/target/ffmpeg/Makefile index 277d281867..f52e80268f 100644 --- a/tools/depends/target/ffmpeg/Makefile +++ b/tools/depends/target/ffmpeg/Makefile @@ -27,7 +27,6 @@ endif ifeq ($(OS), linux) ffmpg_config += --target-os=$(OS) --cpu=$(CPU) ffmpg_config += --enable-vdpau --enable-vaapi - ffmpg_config += --enable-libvorbis --enable-muxer=ogg --enable-encoder=libvorbis endif ifeq ($(OS), android) ifeq ($(findstring arm, $(CPU)), arm) diff --git a/tools/depends/target/ffmpeg/autobuild.sh b/tools/depends/target/ffmpeg/autobuild.sh index bf02e526f1..1add222869 100755 --- a/tools/depends/target/ffmpeg/autobuild.sh +++ b/tools/depends/target/ffmpeg/autobuild.sh @@ -152,9 +152,6 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" \ --enable-encoder=aac \ --enable-encoder=wmav2 \ --enable-protocol=http \ - --enable-libvorbis \ - --enable-muxer=ogg \ - --enable-encoder=libvorbis \ --enable-encoder=png \ --enable-encoder=mjpeg \ --enable-nonfree \ |