diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/FileSource.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/FileSource.cpp b/media/libstagefright/FileSource.cpp index b46d8d0..e4f9a47 100644 --- a/media/libstagefright/FileSource.cpp +++ b/media/libstagefright/FileSource.cpp @@ -21,7 +21,7 @@ namespace android { FileSource::FileSource(const char *filename) : mFile(fopen(filename, "rb")), - mFd(fileno(mFile)), + mFd(mFile == NULL ? -1 : fileno(mFile)), mOffset(0), mLength(-1), mDecryptHandle(NULL), diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index ee03c52..965c370 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -65,7 +65,7 @@ sp<MediaExtractor> MediaExtractor::Create( } if (!strncmp(mime, "drm", 3)) { - char *originalMime = strrchr(mime, '+') + 1; + const char *originalMime = strrchr(mime, '+') + 1; if (!strncmp(mime, "drm+es_based", 12)) { return new DRMExtractor(source, originalMime); |