diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 17:26:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 17:26:28 +0000 |
| commit | dd01ce9c28e37d4556606f481faeec032a1fe04e (patch) | |
| tree | 9d15e20598193a7c4ab3d90beb5f8405c8d27a6f /media/libstagefright/matroska | |
| parent | 52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8 (diff) | |
| parent | 52a861d2825544fe2eb90f8e5f6351d02ff95536 (diff) | |
| download | frameworks_av-dd01ce9c28e37d4556606f481faeec032a1fe04e.zip frameworks_av-dd01ce9c28e37d4556606f481faeec032a1fe04e.tar.gz frameworks_av-dd01ce9c28e37d4556606f481faeec032a1fe04e.tar.bz2 | |
am 52a861d2: Merge "warnings be gone."
* commit '52a861d2825544fe2eb90f8e5f6351d02ff95536':
warnings be gone.
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/matroska/Android.mk b/media/libstagefright/matroska/Android.mk index 2d8c1e1..446ff8c 100644 --- a/media/libstagefright/matroska/Android.mk +++ b/media/libstagefright/matroska/Android.mk @@ -8,7 +8,7 @@ LOCAL_C_INCLUDES:= \ $(TOP)/external/libvpx/libwebm \ $(TOP)/frameworks/native/include/media/openmax \ -LOCAL_CFLAGS += -Wno-multichar +LOCAL_CFLAGS += -Wno-multichar -Werror LOCAL_MODULE:= libstagefright_matroska diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index dcb1cda..775350d 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -193,7 +193,7 @@ MatroskaSource::~MatroskaSource() { clearPendingFrames(); } -status_t MatroskaSource::start(MetaData *params) { +status_t MatroskaSource::start(MetaData * /* params */) { mBlockIter.reset(); return OK; |