diff options
| author | James Dong <jdong@google.com> | 2011-06-03 17:42:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-03 17:42:31 -0700 |
| commit | 20214f3908a6f085ea531c65496347953e2d25b6 (patch) | |
| tree | 8ad49e057ada34ff10dfb0c74ded58622f3589cb /media/libstagefright/OMXCodec.cpp | |
| parent | 158b194da537c18a6ad1d7ef3cd63c87b2310269 (diff) | |
| parent | 0c1bc742181ded4930842b46e9507372f0b1b963 (diff) | |
| download | frameworks_av-20214f3908a6f085ea531c65496347953e2d25b6.zip frameworks_av-20214f3908a6f085ea531c65496347953e2d25b6.tar.gz frameworks_av-20214f3908a6f085ea531c65496347953e2d25b6.tar.bz2 | |
Merge "Initial-checkin for ON2 Software AVC/H264 decoder"
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index e71f16c..79e767b 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -200,6 +200,7 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.qcom.video.decoder.avc" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.SEC.AVC.Decoder" }, + { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.google.h264.decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "OMX.google.avc.decoder" }, { MEDIA_MIMETYPE_VIDEO_AVC, "AVCDecoder" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "OMX.google.vorbis.decoder" }, |