diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-06 00:06:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-06 00:06:50 +0000 |
| commit | e576086224f6e630159eaeec59ab5146c8533dc7 (patch) | |
| tree | 5a9605c000abb905142dfad5e6597915ab51f784 /include | |
| parent | 7dbbc7ec95c3040668388162a0ffbc45b68af6f1 (diff) | |
| parent | bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794 (diff) | |
| download | frameworks_av-e576086224f6e630159eaeec59ab5146c8533dc7.zip frameworks_av-e576086224f6e630159eaeec59ab5146c8533dc7.tar.gz frameworks_av-e576086224f6e630159eaeec59ab5146c8533dc7.tar.bz2 | |
am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev
* commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794':
stagefright: add fallback for native flex-YUV support
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 54a4e8b..d448097 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -194,7 +194,7 @@ private: }; enum { - kFlagIsSoftwareCodec = 1, + kFlagUsesSoftwareRenderer = 1, kFlagOutputFormatChanged = 2, kFlagOutputBuffersChanged = 4, kFlagStickyError = 8, |