summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 15:13:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 15:13:05 +0000
commitb5f7b18749a490a61eac66572ab1a009c608468b (patch)
tree4673becafb5ff3877d8cf6e3b388bf67c4253f80
parentc9402076b65025c994c28bac0350d5b600d1d6fe (diff)
parent161c69714db0a5a12ef09d85533773b7ab6152d9 (diff)
downloadbuild-b5f7b18749a490a61eac66572ab1a009c608468b.zip
build-b5f7b18749a490a61eac66572ab1a009c608468b.tar.gz
build-b5f7b18749a490a61eac66572ab1a009c608468b.tar.bz2
am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '161c69714db0a5a12ef09d85533773b7ab6152d9': core_base.mk: switch to new H264 and MPEG2 software codecs
-rw-r--r--target/product/core_base.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 6c29482..03d33e1 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -41,13 +41,14 @@ PRODUCT_PACKAGES += \
libstagefright_soft_amrdec \
libstagefright_soft_amrnbenc \
libstagefright_soft_amrwbenc \
+ libstagefright_soft_avcdec \
+ libstagefright_soft_avcenc \
libstagefright_soft_flacenc \
libstagefright_soft_g711dec \
libstagefright_soft_gsmdec \
- libstagefright_soft_h264dec \
- libstagefright_soft_h264enc \
libstagefright_soft_hevcdec \
libstagefright_soft_mp3dec \
+ libstagefright_soft_mpeg2dec \
libstagefright_soft_mpeg4dec \
libstagefright_soft_mpeg4enc \
libstagefright_soft_opusdec \