summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Writer.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-02-27 17:59:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-02-27 17:59:00 +0000
commit68189471332964a65f0d1f47cda7724c562c566d (patch)
tree6edd7c2af8ccfa830e5b0b670df81686e6f03a56 /media/libstagefright/MPEG4Writer.cpp
parentceb388d6c03c38b96dc41c0ea4804b749aa077c4 (diff)
parent801726efb2dcc6ea19e9f55c7c43fe41f0c6643e (diff)
downloadframeworks_av-68189471332964a65f0d1f47cda7724c562c566d.zip
frameworks_av-68189471332964a65f0d1f47cda7724c562c566d.tar.gz
frameworks_av-68189471332964a65f0d1f47cda7724c562c566d.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.cpp3
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