am fb102b1b: am 7c794b16: Merge "Revert "core_base.mk: switch to new H264 and MPEG2 software codecs""

* commit 'fb102b1b5107fced1fb7cfdb98b051efb3575ec5':
  Revert "core_base.mk: switch to new H264 and MPEG2 software codecs"
This commit is contained in:
Lajos Molnar 2015-04-16 16:19:14 +00:00 committed by Android Git Automerger
commit 8cd7e9442c

View file

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