drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e95d192f: Mainly fix two mistakes that I made:

Browse Source 
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp

* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
  Mainly fix two mistakes that I made:
This commit is contained in:
James Dong
2010-08-12 17:02:42 -07:00
committed by Android Git Automerger
parent 2f02044944 e95d192fae
commit 38a9f4050a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/libstagefright/codecs/avc/enc/AVCEncoder.cpp
View File

@ -98,6 +98,7 @@ AVCEncoder::AVCEncoder(
: mSource(source),
mMeta(meta),
mNumInputFrames(-1),
mPrevTimestampUs(-1),
mStarted(false),
mInputBuffer(NULL),
mInputFrameData(NULL),

3
media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
View File

@ -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;
}