diff options
| author | James Dong <jdong@google.com> | 2010-08-12 17:05:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 17:05:28 -0700 |
| commit | 67dfaec8cf5c5cda9a3e2bd1c9d514f9cbfd0e73 (patch) | |
| tree | e7b53b01d75b8bf047c29f23e51bfa098fca5482 | |
| parent | 4e806c596f99d0054f4fd1185809319c3b298a0b (diff) | |
| parent | 38a9f4050ac4b299c459e25bfff6b852bc8de54f (diff) | |
| download | frameworks_base-67dfaec8cf5c5cda9a3e2bd1c9d514f9cbfd0e73.zip frameworks_base-67dfaec8cf5c5cda9a3e2bd1c9d514f9cbfd0e73.tar.gz frameworks_base-67dfaec8cf5c5cda9a3e2bd1c9d514f9cbfd0e73.tar.bz2 | |
am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:
Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'
* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
Mainly fix two mistakes that I made:
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/AVCEncoder.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp index a99186b..389180c 100644 --- a/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp +++ b/media/libstagefright/codecs/avc/enc/AVCEncoder.cpp @@ -98,6 +98,7 @@ AVCEncoder::AVCEncoder( : mSource(source), mMeta(meta), mNumInputFrames(-1), + mPrevTimestampUs(-1), mStarted(false), mInputBuffer(NULL), mInputFrameData(NULL), diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index 5ea5859..a011137 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -69,6 +69,7 @@ M4vH263Encoder::M4vH263Encoder( mMeta(meta), mNumInputFrames(-1), mNextModTimeUs(0), + mPrevTimestampUs(-1), mStarted(false), mInputBuffer(NULL), mInputFrameData(NULL), @@ -292,8 +293,6 @@ status_t M4vH263Encoder::read( if (OK != mSource->read(&mInputBuffer, options)) { LOGE("Failed to read from data source"); outputBuffer->release(); - mInputBuffer->release(); - mInputBuffer = NULL; return UNKNOWN_ERROR; } |