diff options
| author | Lajos Molnar <lajos@google.com> | 2015-04-16 16:19:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-16 16:19:14 +0000 |
| commit | 8cd7e9442cfbd8247bb99c312f6e98649b3afe42 (patch) | |
| tree | ca9b8578e4a8fac90cd27442baf2e47d57a4f61f /target | |
| parent | ec1c2c0fea5b82ecf480d32dd3679f8437f720eb (diff) | |
| parent | fb102b1b5107fced1fb7cfdb98b051efb3575ec5 (diff) | |
| download | build-8cd7e9442cfbd8247bb99c312f6e98649b3afe42.zip build-8cd7e9442cfbd8247bb99c312f6e98649b3afe42.tar.gz build-8cd7e9442cfbd8247bb99c312f6e98649b3afe42.tar.bz2 | |
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"
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/core_base.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/product/core_base.mk b/target/product/core_base.mk index 03d33e1..6c29482 100644 --- a/target/product/core_base.mk +++ b/target/product/core_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 \ |