diff options
| author | James Dong <jdong@google.com> | 2010-08-12 10:12:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 10:12:21 -0700 |
| commit | f4e26da1af90145564f6065d62cf8efcef0c6f04 (patch) | |
| tree | dd911f143e43424e8643b40c4a4afbc8f82e286a /media | |
| parent | 0386d04b19619b03b6bce830010e11d31d3f8a5c (diff) | |
| parent | b6541f0af89b1fe85cb53e5dac461587eb040fb0 (diff) | |
| download | frameworks_base-f4e26da1af90145564f6065d62cf8efcef0c6f04.zip frameworks_base-f4e26da1af90145564f6065d62cf8efcef0c6f04.tar.gz frameworks_base-f4e26da1af90145564f6065d62cf8efcef0c6f04.tar.bz2 | |
am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread
Merge commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0' into gingerbread-plus-aosp
* commit 'b6541f0af89b1fe85cb53e5dac461587eb040fb0':
Fix a crash due to unnecessary check on the codec config data for H263 video track
Diffstat (limited to 'media')
| -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 |