diff options
| author | Andreas Huber <andih@google.com> | 2014-02-07 15:36:10 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2014-02-11 11:41:07 -0800 |
| commit | 84333e0475bc911adc16417f4ca327c975cf6c36 (patch) | |
| tree | 4973c505d7c73d883c2cd796bc66ba96312c4a7a /media/libstagefright/matroska | |
| parent | 1d6fa7af1288b550faabe4ec2cf98684236723db (diff) | |
| download | frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.zip frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.gz frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.bz2 | |
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 4 |
2 files changed, 3 insertions, 3 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..6f69d0b 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; @@ -410,7 +410,7 @@ void BlockIterator::seek( // Accept the first key frame *actualFrameTimeUs = (block()->GetTime(mCluster) + 500LL) / 1000LL; ALOGV("Requested seek point: %lld actual: %lld", - seekTimeUs, actualFrameTimeUs); + seekTimeUs, *actualFrameTimeUs); break; } } |