diff options
| author | Andreas Huber <andih@google.com> | 2010-08-12 16:20:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 16:20:56 -0700 |
| commit | 0e8e269d2981f3567c40676891a934a746c00678 (patch) | |
| tree | 569011bc838e02008fda7703b5f738811ab09fd9 | |
| parent | e0b8d3cbf73a3694a24f366ab43488bfaef9da71 (diff) | |
| parent | 73af0a9211d0c4be663d287cefd9bf35746db1ba (diff) | |
| download | frameworks_base-0e8e269d2981f3567c40676891a934a746c00678.zip frameworks_base-0e8e269d2981f3567c40676891a934a746c00678.tar.gz frameworks_base-0e8e269d2981f3567c40676891a934a746c00678.tar.bz2 | |
am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'
* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
Fix software avc encoder crash at EOS.
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/AVCEncoder.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index 0d89e02..a99186b 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -391,8 +391,6 @@ status_t AVCEncoder::read( if (err != OK) { LOGE("Failed to read input video frame: %d", err); outputBuffer->release(); - mInputBuffer->release(); - mInputBuffer = NULL; return err; } |