summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 16:40:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-16 16:40:33 +0000
commit8ab4f198b31bd280a4817edb9c9a25fbf68ebf15 (patch)
tree1699e860cbca139a49ec80fa35b91d9ae04c361e
parent657f6917b1654fb6cbc7e924bb949c86ee94eba8 (diff)
parent28a2672c522a4bf4be1fb29b5d88d2f782b51eb8 (diff)
downloadandroid_device_google_atv-8ab4f198b31bd280a4817edb9c9a25fbf68ebf15.tar.gz
android_device_google_atv-8ab4f198b31bd280a4817edb9c9a25fbf68ebf15.tar.bz2
android_device_google_atv-8ab4f198b31bd280a4817edb9c9a25fbf68ebf15.zip
am 28a2672c: Revert "atv_base.mk: switch to new H264 and MPEG2 software codecs"
* commit '28a2672c522a4bf4be1fb29b5d88d2f782b51eb8': Revert "atv_base.mk: switch to new H264 and MPEG2 software codecs"
-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 f7b9c13..7350135 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 \