diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-06 02:35:13 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-12-06 13:23:51 +0000 |
| commit | d86dc53518d4541f6377bba1dafcc27626e4da83 (patch) | |
| tree | dd1433d67a661559c03a35cc4a239df33cc8e4f4 | |
| parent | f30e7852a52e00115c39cf630051bd018cddef59 (diff) | |
media: Enable ffmpeg decoders
Change-Id: I776897eb59279daff8bd286f33a2aa2046f1f2ac
| -rw-r--r-- | device.mk | 3 | ||||
| -rw-r--r-- | media_codecs.xml | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -57,7 +57,8 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media_profiles.xml:system/etc/media_profiles.xml \ $(LOCAL_PATH)/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ - frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml + frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ + frameworks/av/media/libstagefright/data/media_codecs_ffmpeg.xml:system/etc/media_codecs_ffmpeg.xml # Prebuilt kl and kcm keymaps PRODUCT_COPY_FILES += \ diff --git a/media_codecs.xml b/media_codecs.xml index f8a79ae..7811cef 100644 --- a/media_codecs.xml +++ b/media_codecs.xml @@ -96,4 +96,5 @@ </Decoders> <Include href="media_codecs_google_video.xml" /> + <Include href="media_codecs_ffmpeg.xml" /> </MediaCodecs> |