diff options
| author | Lajos Molnar <lajos@google.com> | 2015-02-04 22:48:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-04 22:48:59 +0000 |
| commit | 0662f5b0c43fcfdf055704d02ea41202c9b6094a (patch) | |
| tree | 3c1e2d2b109f1541be254870e9ab054506666521 /include | |
| parent | 6fbcf6331abfbbc935bf89332f84303733e578b2 (diff) | |
| parent | 3a01a71dcbb467d06cc5da4a72a82bb588648cfc (diff) | |
| download | frameworks_av-0662f5b0c43fcfdf055704d02ea41202c9b6094a.zip frameworks_av-0662f5b0c43fcfdf055704d02ea41202c9b6094a.tar.gz frameworks_av-0662f5b0c43fcfdf055704d02ea41202c9b6094a.tar.bz2 | |
Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-dev
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, |