commit 5879b2f415e46b26887741a3303af4f97207913d
author Josue Rivera <prbassplayer@gmail.com> Tue Jul 28 02:22:36 2015 +0200
committer Gerrit Code Review <gerrit2@review.slimroms.eu> Tue Jul 28 02:22:38 2015 +0200
tree 8f76f369179ddd2a67e83f41c4b7879b62d349ff
parent 6d6affaab7b460a13242380507806b5eded04fce
parent ef6ca5e9e14684afefc5ba725d14f60cdce953c4

Merge "cm: Update properties and libs for stagefright-plugins" into lp5.1

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 77c17be..0563f28 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -112,11 +112,14 @@
 
 # Stagefright FFMPEG plugin
 PRODUCT_PACKAGES += \
-    libstagefright_soft_ffmpegadec \
-    libstagefright_soft_ffmpegvdec \
-    libFFmpegExtractor \
+    libffmpeg_extractor \
+    libffmpeg_omx \
     media_codecs_ffmpeg.xml
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    media.sf.omx-plugin=libffmpeg_omx.so \
+    media.sf.extractor-plugin=libffmpeg_extractor.so
+
 # easy way to extend to add more packages
 -include vendor/extra/product.mk