summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/Android.mk
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-05-02 17:18:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-02 17:18:01 +0000
commitedf6131d1eca1fdff3b151805d241a1cc81b52ca (patch)
tree1f9a45db703b5d57653099dd783868c150b8dbfd /media/libstagefright/Android.mk
parent47c888a9fb74f8a46fbf666f0611fd1a9491466f (diff)
parent075c8f6e174e824b6bc95809cc25f1430e9d4e62 (diff)
downloadframeworks_av-edf6131d1eca1fdff3b151805d241a1cc81b52ca.zip
frameworks_av-edf6131d1eca1fdff3b151805d241a1cc81b52ca.tar.gz
frameworks_av-edf6131d1eca1fdff3b151805d241a1cc81b52ca.tar.bz2
am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"
* commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
Diffstat (limited to 'media/libstagefright/Android.mk')
-rw-r--r--media/libstagefright/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 6a2a696..3619821 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES:= \
AwesomePlayer.cpp \
CameraSource.cpp \
CameraSourceTimeLapse.cpp \
+ ClockEstimator.cpp \
DataSource.cpp \
DRMExtractor.cpp \
ESDS.cpp \