summaryrefslogtreecommitdiffstats
path: root/libvideoeditor
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2012-03-11 15:47:55 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2012-03-11 15:47:55 -0700
commit18f1ff3f42aa6de3b8a5311c8886ef48980fa65f (patch)
tree9844717470d96183734964c1570b8ba11cc1db84 /libvideoeditor
parent09e1ef282e7b2df400a9f35feb47b48b67af0f3b (diff)
downloadframeworks_av-18f1ff3f42aa6de3b8a5311c8886ef48980fa65f.zip
frameworks_av-18f1ff3f42aa6de3b8a5311c8886ef48980fa65f.tar.gz
frameworks_av-18f1ff3f42aa6de3b8a5311c8886ef48980fa65f.tar.bz2
Update build dependency on AudioMixer header
VideoEditorSRC doesn't need to include AudioMixer.h. VideoEditorResampler includes AudioMixer.h, which requires system/media/audio_effects/include in the include path. Change-Id: Ibf6194831aeb91e788ce0a3b1282a0d930ee6e48
Diffstat (limited to 'libvideoeditor')
-rwxr-xr-xlibvideoeditor/lvpp/VideoEditorSRC.cpp1
-rwxr-xr-xlibvideoeditor/vss/src/Android.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/libvideoeditor/lvpp/VideoEditorSRC.cpp b/libvideoeditor/lvpp/VideoEditorSRC.cpp
index f8578b2..4753dd4 100755
--- a/libvideoeditor/lvpp/VideoEditorSRC.cpp
+++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp
@@ -24,7 +24,6 @@
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDefs.h>
-#include "AudioMixer.h"
#include "VideoEditorSRC.h"
diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk
index 14f8f80..e9c265b 100755
--- a/libvideoeditor/vss/src/Android.mk
+++ b/libvideoeditor/vss/src/Android.mk
@@ -63,6 +63,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_C_INCLUDES += \
$(TOP)/system/media/audio_utils/include \
+ $(TOP)/system/media/audio_effects/include \
$(TOP)/frameworks/base/include \
$(TOP)/frameworks/media/libvideoeditor/osal/inc \
$(TOP)/frameworks/media/libvideoeditor/vss/inc \