summaryrefslogtreecommitdiffstats
path: root/media
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
commit6ee1b867bb316fa3eda3b0c9f907d473031659d9 (patch)
treeec59f2534cb903f7fb91009effb7b68c554efa97 /media
parent9a6c614a68b07209919aaea3d4a8b5403379fb35 (diff)
parent89b28bfea641983a908b45a15e69a6c62add847a (diff)
downloadframeworks_av-6ee1b867bb316fa3eda3b0c9f907d473031659d9.zip
frameworks_av-6ee1b867bb316fa3eda3b0c9f907d473031659d9.tar.gz
frameworks_av-6ee1b867bb316fa3eda3b0c9f907d473031659d9.tar.bz2
Merge "MPEG4Writer: Write a zero-length compressor string"
Diffstat (limited to 'media')
-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 8b52e15..326930f 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