diff options
| author | James Dong <jdong@google.com> | 2010-08-12 10:07:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-08-12 10:07:38 -0700 |
| commit | b6541f0af89b1fe85cb53e5dac461587eb040fb0 (patch) | |
| tree | de948c83d312e30248ccc14c8f28257af2795923 | |
| parent | 581581fe1addfac8913c8d4d6c88eed6ded90de4 (diff) | |
| parent | 7ae08a6d79d5e6e3e0529ee890f5ca3eae249637 (diff) | |
| download | frameworks_base-b6541f0af89b1fe85cb53e5dac461587eb040fb0.zip frameworks_base-b6541f0af89b1fe85cb53e5dac461587eb040fb0.tar.gz frameworks_base-b6541f0af89b1fe85cb53e5dac461587eb040fb0.tar.bz2 | |
Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
| -rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index c860c5c..1460f37 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -1956,11 +1956,11 @@ void MPEG4Writer::Track::writeTrackHeader( mOwner->writeInt16(0x18); // depth mOwner->writeInt16(-1); // predefined - CHECK(mCodecSpecificData); - CHECK(mCodecSpecificDataSize > 0); CHECK(23 + mCodecSpecificDataSize < 128); if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime)) { + CHECK(mCodecSpecificData); + CHECK(mCodecSpecificDataSize > 0); mOwner->beginBox("esds"); mOwner->writeInt32(0); // version=0, flags=0 |