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/timedtext | |
| 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/timedtext')
| -rw-r--r-- | media/libstagefright/timedtext/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextDriver.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextSource.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/timedtext/Android.mk b/media/libstagefright/timedtext/Android.mk index f099bbd..6a8b9fc 100644 --- a/media/libstagefright/timedtext/Android.mk +++ b/media/libstagefright/timedtext/Android.mk @@ -9,7 +9,8 @@ LOCAL_SRC_FILES:= \ TimedTextSRTSource.cpp \ TimedTextPlayer.cpp -LOCAL_CFLAGS += -Wno-multichar +LOCAL_CFLAGS += -Wno-multichar -Werror + LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/av/media/libstagefright diff --git a/media/libstagefright/timedtext/TimedTextDriver.cpp b/media/libstagefright/timedtext/TimedTextDriver.cpp index 05d6d02..71aa21e 100644 --- a/media/libstagefright/timedtext/TimedTextDriver.cpp +++ b/media/libstagefright/timedtext/TimedTextDriver.cpp @@ -45,6 +45,7 @@ TimedTextDriver::TimedTextDriver( const sp<IMediaHTTPService> &httpService) : mLooper(new ALooper), mListener(listener), + mHTTPService(httpService), mState(UNINITIALIZED), mCurrentTrackIndex(UINT_MAX) { mLooper->setName("TimedTextDriver"); diff --git a/media/libstagefright/timedtext/TimedTextSource.h b/media/libstagefright/timedtext/TimedTextSource.h index 756cc31..8c1c1cd 100644 --- a/media/libstagefright/timedtext/TimedTextSource.h +++ b/media/libstagefright/timedtext/TimedTextSource.h @@ -47,7 +47,7 @@ class TimedTextSource : public RefBase { int64_t *endTimeUs, Parcel *parcel, const MediaSource::ReadOptions *options = NULL) = 0; - virtual status_t extractGlobalDescriptions(Parcel *parcel) { + virtual status_t extractGlobalDescriptions(Parcel * /* parcel */) { return INVALID_OPERATION; } virtual sp<MetaData> getFormat(); |