Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1355617 - static_cast UNKNOWN_ERROR to status_t to remove harmless warning - r=alfredo

Browse Source 
MozReview-Commit-ID: 6WCReMGpvGq

--HG--
extra : rebase_source : e9ed275e6221b18537589b9651100e5e5c2d960e
This commit is contained in:
Gerald Squelart 2017-04-27 17:12:02 +12:00
parent 321df64731
commit 65152d49d4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/libstagefright/frameworks/av/media/libstagefright/MPEG4Extractor.cpp
View File

@ -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<status_t>(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<status_t>(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<status_t>(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<status_t>(UNKNOWN_ERROR); // stop parsing after sidx
}
case FOURCC('w', 'a', 'v', 'e'):