summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-11-03 09:25:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-03 09:25:08 -0700
commita3f5b615d7adc5a644cbedd55100deba562ec0ac (patch)
tree2f3cce676494fbdb8eb56e561881873f8f9ce4b9 /include
parent0ce0f72c1eb92cf654667c15477f19b4a7e84cd1 (diff)
parentf3847e875eb1c58094a2d159a2a6f3f0b381d77a (diff)
downloadframeworks_base-a3f5b615d7adc5a644cbedd55100deba562ec0ac.zip
frameworks_base-a3f5b615d7adc5a644cbedd55100deba562ec0ac.tar.gz
frameworks_base-a3f5b615d7adc5a644cbedd55100deba562ec0ac.tar.bz2
am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a': DO NOT MERGE
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/OMXCodec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 1d94160..fed6761 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -109,6 +109,7 @@ private:
kAvoidMemcopyInputRecordingFrames = 2048,
kRequiresLargerEncoderOutputBuffer = 4096,
kOutputBuffersAreUnreadable = 8192,
+ kStoreMetaDataInInputVideoBuffers = 16384,
};
struct BufferInfo {