From 8e95e5c2ea07b5e6d09a75c0ed044cc57bfb2161 Mon Sep 17 00:00:00 2001
From: Matt Filetto <matt.filetto@gmail.com>
Date: Tue, 25 Nov 2014 20:19:38 -0800
Subject: [PATCH] msm8974-common: Include FFMPEG codec configuration

Change-Id: I629fe6d5478f0c8ea571e9525c70b82fcdb30e84
---
 configs/media_codecs.xml | 1 +
 msm8974.mk               | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 17a05f5..bf895c8 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -172,4 +172,5 @@
     <Include href="media_codecs_google_audio.xml" />
     <Include href="media_codecs_google_telephony.xml" />
     <Include href="media_codecs_google_video.xml" />
+    <Include href="media_codecs_ffmpeg.xml" />
 </MediaCodecs>
diff --git a/msm8974.mk b/msm8974.mk
index 7f295f6..0eb19a0 100644
--- a/msm8974.mk
+++ b/msm8974.mk
@@ -105,6 +105,7 @@ PRODUCT_COPY_FILES += \
 
 # Media
 PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_ffmpeg.xml:system/etc/media_codecs_ffmpeg.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_telephony.xml:system/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml  \