diff options
| author | Andreas Huber <andih@google.com> | 2010-11-03 14:40:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-03 14:40:27 -0700 |
| commit | dbd40762b0d68e1a8333ec2f46acaf71e5938673 (patch) | |
| tree | f0eea99af2e28f8cbab578365c6dede2335e9848 /media | |
| parent | a935bc4696e4060c362b0f6913cc220331667a35 (diff) | |
| parent | 09ddead9fcb391efd718738245455398a7ec6887 (diff) | |
| download | frameworks_av-dbd40762b0d68e1a8333ec2f46acaf71e5938673.zip frameworks_av-dbd40762b0d68e1a8333ec2f46acaf71e5938673.tar.gz frameworks_av-dbd40762b0d68e1a8333ec2f46acaf71e5938673.tar.bz2 | |
Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 9e1b436..3c3bd93 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -167,13 +167,13 @@ static const CodecInfo kDecoderInfo[] = { { MEDIA_MIMETYPE_AUDIO_AAC, "AACDecoder" }, { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "G711Decoder" }, { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "G711Decoder" }, -// { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.decode" }, + { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.Nvidia.mp4.decode" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.7x30.video.decoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.qcom.video.decoder.mpeg4" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.TI.Video.Decoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "OMX.SEC.MPEG4.Decoder" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, "M4vH263Decoder" }, -// { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.decode" }, + { MEDIA_MIMETYPE_VIDEO_H263, "OMX.Nvidia.h263.decode" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.7x30.video.decoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.qcom.video.decoder.h263" }, { MEDIA_MIMETYPE_VIDEO_H263, "OMX.SEC.H263.Decoder" }, |