commit 801726efb2dcc6ea19e9f55c7c43fe41f0c6643e
author Andreas Huber <andih@google.com> Wed Feb 27 16:53:21 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 27 16:53:21 2013 +0000
tree 547295c3a263dc005ae2cc1fca0bc1773fb5d4e2
parent c3afe5591a5c3a1aaf1cdcdeded75f6cff931569
parent c30a88a273b47bef6728ae1dddea11641090939a

Merge "MPEG4Writer: Write a zero-length compressor string"

media/libstagefright/MPEG4Writer.cpp

diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp
index 8b52e15..326930f 100755
--- a/media/libstagefright/MPEG4Writer.cpp
+++ b/media/libstagefright/MPEG4Writer.cpp
@@ -2558,7 +2558,8 @@
     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