summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-11 15:58:59 -0700
committerJames Dong <jdong@google.com>2010-08-11 15:58:59 -0700
commit7ae08a6d79d5e6e3e0529ee890f5ca3eae249637 (patch)
tree62cf795c1e0ffcda5a543688185cac92f59d0baa
parent224ab9a5c6f7ae70fe55bf3d5604cbdf883baee7 (diff)
downloadframeworks_base-7ae08a6d79d5e6e3e0529ee890f5ca3eae249637.zip
frameworks_base-7ae08a6d79d5e6e3e0529ee890f5ca3eae249637.tar.gz
frameworks_base-7ae08a6d79d5e6e3e0529ee890f5ca3eae249637.tar.bz2
Fix a crash due to unnecessary check on the codec config data for H263 video track
Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
-rw-r--r--media/libstagefright/MPEG4Writer.cpp4
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