diff options
| author | Andreas Huber <andih@google.com> | 2013-04-22 16:15:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-22 16:15:52 +0000 |
| commit | 6e96f5927bd2234606ad3fcef1c1dc3029e66347 (patch) | |
| tree | 3f835ca3e388cfdaa3c2522adca65bdd09856222 /include | |
| parent | 20ab26dbe54cd9ef81072c492bc466c0c4da46d8 (diff) | |
| parent | 6b5d15099579c179d8e7531bb5abfb272614513a (diff) | |
| download | frameworks_av-6e96f5927bd2234606ad3fcef1c1dc3029e66347.zip frameworks_av-6e96f5927bd2234606ad3fcef1c1dc3029e66347.tar.gz frameworks_av-6e96f5927bd2234606ad3fcef1c1dc3029e66347.tar.bz2 | |
Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 35f46dc..a06a8e1 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -176,6 +176,7 @@ private: kFlagDequeueInputPending = 16, kFlagDequeueOutputPending = 32, kFlagIsSecure = 64, + kFlagSawMediaServerDie = 128, }; struct BufferInfo { |