summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-10-08 09:22:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-08 09:22:29 -0700
commita6b76c35a482bd7f2cbab186aca9ea6e74a375d0 (patch)
tree3b709931c11d6ce0a8a4dcc740c257f1a3a6b8b7 /include
parentc18d869629783cf37f07632ece17d27d6d10dd9e (diff)
parentcd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9 (diff)
downloadframeworks_base-a6b76c35a482bd7f2cbab186aca9ea6e74a375d0.zip
frameworks_base-a6b76c35a482bd7f2cbab186aca9ea6e74a375d0.tar.gz
frameworks_base-a6b76c35a482bd7f2cbab186aca9ea6e74a375d0.tar.bz2
am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp * commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9': The vendor is about to check in a fix for this issue, the workaround is no longer needed
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/OMXCodec.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index e19830b..ff7e34a 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -90,7 +90,6 @@ private:
kRequiresFlushCompleteEmulation = 16,
kRequiresAllocateBufferOnOutputPorts = 32,
kRequiresFlushBeforeShutdown = 64,
- kAlwaysAllocateOutputWithPadding = 128,
};
struct BufferInfo {