diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-11 18:26:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 18:26:26 +0000 |
| commit | 355c04dfe84b06311bdb15a1617e22bea4eb2571 (patch) | |
| tree | 17094420fcab88bdbe28583b8121f92c810a6462 /media | |
| parent | dd01ce9c28e37d4556606f481faeec032a1fe04e (diff) | |
| parent | 797248568b5ba32606ac0d8de024190e3cc95973 (diff) | |
| download | frameworks_av-355c04dfe84b06311bdb15a1617e22bea4eb2571.zip frameworks_av-355c04dfe84b06311bdb15a1617e22bea4eb2571.tar.gz frameworks_av-355c04dfe84b06311bdb15a1617e22bea4eb2571.tar.bz2 | |
am 79724856: Merge "warnings be gone (2/4)"
* commit '797248568b5ba32606ac0d8de024190e3cc95973':
warnings be gone (2/4)
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 3a9671a..20c3a76 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -163,18 +163,18 @@ status_t M3UParser::MediaGroup::selectTrack(size_t index, bool select) { if (select) { if (index >= mMediaItems.size()) { - ALOGE("track %d does not exist", index); + ALOGE("track %zu does not exist", index); return INVALID_OPERATION; } - if (mSelectedIndex == index) { - ALOGE("track %d already selected", index); + if (mSelectedIndex == (ssize_t)index) { + ALOGE("track %zu already selected", index); return BAD_VALUE; } ALOGV("selected track %d", index); mSelectedIndex = index; } else { - if (mSelectedIndex != index) { - ALOGE("track %d is not selected", index); + if (mSelectedIndex != (ssize_t)index) { + ALOGE("track %zu is not selected", index); return BAD_VALUE; } ALOGV("unselected track %d", index); |