diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-29 14:01:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-29 14:01:57 -0700 |
| commit | 25a07d3f574755b8ee265fd3970d9d7b647ed0fd (patch) | |
| tree | cb4fd374aba7734ac878d57d1202c6000d29e13e /media/libstagefright/MPEG4Writer.cpp | |
| parent | 082cd30aad32413c4be1acad2ddb8a29c4065cdf (diff) | |
| parent | 85ad714b38516807efe40d67da406208d72b0dd0 (diff) | |
| download | frameworks_av-25a07d3f574755b8ee265fd3970d9d7b647ed0fd.zip frameworks_av-25a07d3f574755b8ee265fd3970d9d7b647ed0fd.tar.gz frameworks_av-25a07d3f574755b8ee265fd3970d9d7b647ed0fd.tar.bz2 | |
Merge "stagefright: Return error for wrong buffer index in MediaCodec"
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index cb9df29..8dfc54c 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -2231,7 +2231,9 @@ status_t MPEG4Writer::Track::threadEntry() { MediaBuffer *buffer; const char *trackName = mIsAudio ? "Audio" : "Video"; while (!mDone && (err = mSource->read(&buffer)) == OK) { - if (buffer->range_length() == 0) { + if (buffer == NULL) { + continue; + } else if (buffer->range_length() == 0) { buffer->release(); buffer = NULL; ++nZeroLengthFrames; |