Skip to content
Snippets Groups Projects
Commit 4503d938 authored by Adrien Béraud's avatar Adrien Béraud Committed by Gerrit Code Review
Browse files

contrib: fix android libav deps

Refs #70083

Change-Id: Iba3305ee2e4dc634c6879db7e92ed9dd484a9336
parent 992e1faa
Branches
Tags beta/202309201323
No related merge requests found
...@@ -28,15 +28,13 @@ LIBAVCONF += \ ...@@ -28,15 +28,13 @@ LIBAVCONF += \
--enable-parser=h263 \ --enable-parser=h263 \
--enable-parser=h264 \ --enable-parser=h264 \
--enable-parser=mpeg4video \ --enable-parser=mpeg4video \
--enable-parser=opus \ --enable-parser=opus
--enable-parser=vp8
#librairies #librairies
LIBAVCONF += \ LIBAVCONF += \
--enable-libx264 \ --enable-libx264 \
--enable-libopus \ --enable-libopus \
--enable-libspeex \ --enable-libspeex
--enable-libvpx
#encoders/decoders #encoders/decoders
LIBAVCONF += \ LIBAVCONF += \
...@@ -54,20 +52,24 @@ LIBAVCONF += \ ...@@ -54,20 +52,24 @@ LIBAVCONF += \
--enable-decoder=libopus \ --enable-decoder=libopus \
--enable-encoder=mpeg4 \ --enable-encoder=mpeg4 \
--enable-decoder=mpeg4 \ --enable-decoder=mpeg4 \
--enable-encoder=libvpx_vp8 \
--enable-decoder=vp8 \
--enable-encoder=h263 \ --enable-encoder=h263 \
--enable-decoder=h263 \ --enable-decoder=h263 \
--enable-encoder=libspeex \ --enable-encoder=libspeex \
--enable-decoder=libspeex --enable-decoder=libspeex
# Linux # Linux
ifdef HAVE_LINUX ifndef HAVE_ANDROID
LIBAVCONF += \ LIBAVCONF += \
--enable-x11grab --enable-parser=vp8 \
--enable-libvpx \
--enable-encoder=libvpx_vp8 \
--enable-decoder=vp8
endif endif
DEPS_libav = zlib x264 vpx $(DEPS_vpx) DEPS_libav = zlib x264 opus speex
ifndef HAVE_ANDROID
DEPS_libav += vpx $(DEPS_vpx)
endif
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
LIBAVCONF += --enable-cross-compile LIBAVCONF += --enable-cross-compile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment