commit ec1c2c0fea5b82ecf480d32dd3679f8437f720eb
author Lajos Molnar <lajos@google.com> Thu Apr 16 15:24:42 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 16 15:24:42 2015 +0000
tree 8ba201d58ff2f20411739c1569d167f7e148d2e6
parent d756e7367ab60d5e4138d7561aaabf4256e3d247
parent b5f7b18749a490a61eac66572ab1a009c608468b

am b5f7b187: am 161c6971: Merge "core_base.mk: switch to new H264 and MPEG2 software codecs"

* commit 'b5f7b18749a490a61eac66572ab1a009c608468b':
  core_base.mk: switch to new H264 and MPEG2 software codecs

target/product/core_base.mk

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 @@
     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 \