diff options
| author | Ying Wang <wangying@google.com> | 2012-12-12 14:57:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-12-12 14:57:16 -0800 |
| commit | 8cade496e47fc7d8f01e286579a5db15b85c59cc (patch) | |
| tree | b5ab1e2a8101fdc324aa711af4a948e4fe95f541 /media/libstagefright/matroska | |
| parent | 4fa89b9b52e3329bb846ef314fb0ac65c0c1e04f (diff) | |
| parent | fd88f86ec6788170fb4d903c1b0932a18ce1197c (diff) | |
| download | frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.zip frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.tar.gz frameworks_av-8cade496e47fc7d8f01e286579a5db15b85c59cc.tar.bz2 | |
Merge "Match new paths and organization in external/libvpx"
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index 2cccb4f..2d8c1e1 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -5,7 +5,7 @@ LOCAL_SRC_FILES:= \ MatroskaExtractor.cpp LOCAL_C_INCLUDES:= \ - $(TOP)/external/libvpx/mkvparser \ + $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ LOCAL_CFLAGS += -Wno-multichar |