diff options
| author | Lajos Molnar <lajos@google.com> | 2014-06-06 22:59:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-06 22:59:08 +0000 |
| commit | 8a45461198c69e9e15f133c2e11ded47fc4c708b (patch) | |
| tree | 381f92c1252982ea3bb0ecdeab747093900c2b0b /media/libstagefright/data | |
| parent | 270facca297275a4889d1cc49ec4d2768ed38bb7 (diff) | |
| parent | 3b5a6b9fa6c6825a1d0b441429e2bb365b259827 (diff) | |
| download | frameworks_av-8a45461198c69e9e15f133c2e11ded47fc4c708b.zip frameworks_av-8a45461198c69e9e15f133c2e11ded47fc4c708b.tar.gz frameworks_av-8a45461198c69e9e15f133c2e11ded47fc4c708b.tar.bz2 | |
Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-preview-dev
Diffstat (limited to 'media/libstagefright/data')
| -rw-r--r-- | media/libstagefright/data/media_codecs_google_video.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/data/media_codecs_google_video.xml b/media/libstagefright/data/media_codecs_google_video.xml index 41e0efb..9b930bc 100644 --- a/media/libstagefright/data/media_codecs_google_video.xml +++ b/media/libstagefright/data/media_codecs_google_video.xml @@ -19,6 +19,7 @@ <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" /> <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" /> <MediaCodec name="OMX.google.h264.decoder" type="video/avc" /> + <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" /> <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" /> <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" /> </Decoders> |