diff options
author | Andreas Huber <andih@google.com> | 2013-02-27 17:59:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-27 17:59:00 +0000 |
commit | aebd9bbed761d99b20bb1871ed170021fb3c68ad (patch) | |
tree | 7ae482fd31c7992c0fc739a7996fe49986b96d07 /media/libstagefright/MPEG4Writer.cpp | |
parent | 48af7e8dd40883d6154e7029d9500072b551b5fa (diff) | |
parent | 6ee1b867bb316fa3eda3b0c9f907d473031659d9 (diff) | |
download | frameworks_av-aebd9bbed761d99b20bb1871ed170021fb3c68ad.zip frameworks_av-aebd9bbed761d99b20bb1871ed170021fb3c68ad.tar.gz frameworks_av-aebd9bbed761d99b20bb1871ed170021fb3c68ad.tar.bz2 |
am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string"
* commit '801726efb2dcc6ea19e9f55c7c43fe41f0c6643e':
MPEG4Writer: Write a zero-length compressor string
Diffstat (limited to 'media/libstagefright/MPEG4Writer.cpp')
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 14986b2..056b47a 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -2612,7 +2612,8 @@ void MPEG4Writer::Track::writeVideoFourCCBox() { mOwner->writeInt32(0x480000); // vert resolution mOwner->writeInt32(0); // reserved mOwner->writeInt16(1); // frame count - mOwner->write(" ", 32); + mOwner->writeInt8(0); // compressor string length + mOwner->write(" ", 31); mOwner->writeInt16(0x18); // depth mOwner->writeInt16(-1); // predefined |