summaryrefslogtreecommitdiff
path: root/media/libstagefright
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2013-02-27 16:53:21 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-02-27 16:53:21 +0000
commit801726efb2dcc6ea19e9f55c7c43fe41f0c6643e (patch)
tree547295c3a263dc005ae2cc1fca0bc1773fb5d4e2 /media/libstagefright
parentc3afe5591a5c3a1aaf1cdcdeded75f6cff931569 (diff)
parentc30a88a273b47bef6728ae1dddea11641090939a (diff)
Merge "MPEG4Writer: Write a zero-length compressor string"
Diffstat (limited to 'media/libstagefright')
-rwxr-xr-xmedia/libstagefright/MPEG4Writer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 8b52e15d..326930f5 100755
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2558,7 +2558,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