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

Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-08-12 10:07:38 -07:00
committed by Android (Google) Code Review
parent 581581fe1a 7ae08a6d79
commit b6541f0af8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/MPEG4Writer.cpp
View File

@ -1956,11 +1956,11 @@ void MPEG4Writer::Track::writeTrackHeader(
mOwner->writeInt16(0x18); // depth mOwner->writeInt16(0x18); // depth
mOwner->writeInt16(-1); // predefined mOwner->writeInt16(-1); // predefined
CHECK(mCodecSpecificData);
CHECK(mCodecSpecificDataSize > 0);
CHECK(23 + mCodecSpecificDataSize < 128); CHECK(23 + mCodecSpecificDataSize < 128);
if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime)) { if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_MPEG4, mime)) {
CHECK(mCodecSpecificData);
CHECK(mCodecSpecificDataSize > 0);
mOwner->beginBox("esds"); mOwner->beginBox("esds");
mOwner->writeInt32(0); // version=0, flags=0 mOwner->writeInt32(0); // version=0, flags=0