summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2013-02-13 18:18:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-13 18:18:22 +0000
commitc7c78e3d17cd3e599b052b35dfa7ba204803ac53 (patch)
tree30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d /media
parent79e499be700ff3365b778f9f6b2c179ad69ae43a (diff)
parentb6cd3797b010e0de3366e062f590fcb98c5f81bf (diff)
downloadframeworks_av-c7c78e3d17cd3e599b052b35dfa7ba204803ac53.zip
frameworks_av-c7c78e3d17cd3e599b052b35dfa7ba204803ac53.tar.gz
frameworks_av-c7c78e3d17cd3e599b052b35dfa7ba204803ac53.tar.bz2
Merge "Add OMX.google.vpx.encoder"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/omx/SoftOMXPlugin.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/omx/SoftOMXPlugin.cpp b/media/libstagefright/omx/SoftOMXPlugin.cpp
index 6e1c04d..b3fe98e 100644
--- a/media/libstagefright/omx/SoftOMXPlugin.cpp
+++ b/media/libstagefright/omx/SoftOMXPlugin.cpp
@@ -51,6 +51,7 @@ static const struct {
{ "OMX.google.mp3.decoder", "mp3dec", "audio_decoder.mp3" },
{ "OMX.google.vorbis.decoder", "vorbisdec", "audio_decoder.vorbis" },
{ "OMX.google.vpx.decoder", "vpxdec", "video_decoder.vpx" },
+ { "OMX.google.vpx.encoder", "vpxenc", "video_encoder.vpx" },
{ "OMX.google.raw.decoder", "rawdec", "audio_decoder.raw" },
{ "OMX.google.flac.encoder", "flacenc", "audio_encoder.flac" },
{ "OMX.google.gsm.decoder", "gsmdec", "audio_decoder.gsm" },