From 65152d49d48e0d96a0f6da29ec39cb7095eb7672 Mon Sep 17 00:00:00 2001 From: Gerald Squelart Date: Thu, 27 Apr 2017 17:12:02 +1200 Subject: [PATCH] Bug 1355617 - static_cast UNKNOWN_ERROR to status_t to remove harmless warning - r=alfredo MozReview-Commit-ID: 6WCReMGpvGq --HG-- extra : rebase_source : e9ed275e6221b18537589b9651100e5e5c2d960e --- .../frameworks/av/media/libstagefright/MPEG4Extractor.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp index 092103c52a2b..118de4a343f6 100644 --- a/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp @@ -411,7 +411,7 @@ status_t MPEG4Extractor::readMetaData() { // The parseChunk function returns UNKNOWN_ERROR to skip // some boxes we don't want to handle. Filter that error // code but return others so e.g. I/O errors propagate. - if (err != OK && err != (status_t) UNKNOWN_ERROR) { + if (err != OK && err != static_cast(UNKNOWN_ERROR)) { ALOGW("Error %d parsing chunck at offset %lld looking for first track", err, (long long)offset); break; @@ -627,7 +627,7 @@ status_t MPEG4Extractor::parseDrmSINF(off64_t *offset, off64_t data_offset) { return ERROR_MALFORMED; } - return UNKNOWN_ERROR; // Return a dummy error. + return static_cast(UNKNOWN_ERROR); // Return a dummy error. } struct PathAdder { @@ -845,7 +845,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { mInitCheck = OK; if (!mIsDrm) { - return UNKNOWN_ERROR; // Return a dummy error. + return static_cast(UNKNOWN_ERROR); // Return a dummy error. } else { return OK; } @@ -1979,7 +1979,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { { parseSegmentIndex(data_offset, chunk_data_size); *offset += chunk_size; - return UNKNOWN_ERROR; // stop parsing after sidx + return static_cast(UNKNOWN_ERROR); // stop parsing after sidx } case FOURCC('w', 'a', 'v', 'e'):