summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 15:50:21 +0000
committerLajos Molnar <lajos@google.com>2015-04-16 15:50:21 +0000
commit28a2672c522a4bf4be1fb29b5d88d2f782b51eb8 (patch)
treedc7a7c7b7386220ec8888d9bdf9d70d7e9605374
parent9f2ef6b342d422f04dc617b503b1835f3b4ef6fb (diff)
downloadandroid_device_google_atv-28a2672c522a4bf4be1fb29b5d88d2f782b51eb8.tar.gz
android_device_google_atv-28a2672c522a4bf4be1fb29b5d88d2f782b51eb8.tar.bz2
android_device_google_atv-28a2672c522a4bf4be1fb29b5d88d2f782b51eb8.zip
Revert "atv_base.mk: switch to new H264 and MPEG2 software codecs"
clang builds fail on the dependent libraries This reverts commit 9f2ef6b342d422f04dc617b503b1835f3b4ef6fb. Change-Id: Icba7816d3c78b3dcca5368881b25fab36202f028
-rw-r--r--products/atv_base.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/products/atv_base.mk b/products/atv_base.mk
index b941bf5..e908a13 100644
--- a/products/atv_base.mk
+++ b/products/atv_base.mk
@@ -41,14 +41,13 @@ 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 \