diff options
author | Andreas Huber <andih@google.com> | 2013-08-15 16:12:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-15 16:12:08 +0000 |
commit | 75c16dde986e16ac5fd4d34b06b0cc6a90679866 (patch) | |
tree | 82d64dc5359021224e07e0e63fb74e4d1f3deb16 /include/media | |
parent | c85a986af84962515c10499faab3dc8f9a0948d4 (diff) | |
parent | 0167414e261f88a96b5e4bf6cb592e6ca11e5a95 (diff) | |
download | frameworks_av-75c16dde986e16ac5fd4d34b06b0cc6a90679866.zip frameworks_av-75c16dde986e16ac5fd4d34b06b0cc6a90679866.tar.gz frameworks_av-75c16dde986e16ac5fd4d34b06b0cc6a90679866.tar.bz2 |
Merge "You can now opt-in to having the video decoder push blank buffers to the" into klp-dev
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/ACodec.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 41542ec..a8ffd4a 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -124,7 +124,8 @@ private: }; enum { - kFlagIsSecure = 1, + kFlagIsSecure = 1, + kFlagPushBlankBuffersToNativeWindowOnShutdown = 2, }; struct BufferInfo { |