diff options
| author | Chong Zhang <chz@google.com> | 2015-01-08 18:03:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 18:03:45 +0000 |
| commit | 32479c9f7a004d2c1daeac015684529b0158f8a4 (patch) | |
| tree | d0f6cb7cb08b29506090a4cf44e4c723f903fb16 /include | |
| parent | 2326ed104477a80c850eb3cef6a7039f1585a69d (diff) | |
| parent | 7993d6b343f2723872dac085756743630371454d (diff) | |
| download | frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.zip frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.tar.gz frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.tar.bz2 | |
am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev
* commit '7993d6b343f2723872dac085756743630371454d':
mark any copyrighted content as protected to disable capture
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 4d4ce90..faa2caf 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -131,6 +131,7 @@ private: enum { kFlagIsSecure = 1, kFlagPushBlankBuffersToNativeWindowOnShutdown = 2, + kFlagIsGrallocUsageProtected = 4, }; struct BufferInfo { |