diff options
author | Andreas Huber <andih@google.com> | 2010-08-12 16:18:19 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 16:18:19 -0700 |
commit | 73af0a9211d0c4be663d287cefd9bf35746db1ba (patch) | |
tree | 1944653fa77b6cede3bba41af27bd9fb6c66f4bd /media | |
parent | 1f432b19203b86a2b4da825943024c5b01eaeb60 (diff) | |
parent | 72ac1f26d73bd8e7645365d8d8374fac7a511263 (diff) | |
download | frameworks_base-73af0a9211d0c4be663d287cefd9bf35746db1ba.zip frameworks_base-73af0a9211d0c4be663d287cefd9bf35746db1ba.tar.gz frameworks_base-73af0a9211d0c4be663d287cefd9bf35746db1ba.tar.bz2 |
am 72ac1f26: Fix software avc encoder crash at EOS.
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp
* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
Fix software avc encoder crash at EOS.
Diffstat (limited to 'media')
-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; } |