diff options
| author | Andreas Huber <andih@google.com> | 2010-09-15 16:23:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-15 16:23:06 -0700 |
| commit | 24a2c2b59670b4d9083ff0d23c87d3910a632e7d (patch) | |
| tree | c737ef47dd70c220d0e5747955476a9d7b44bc81 /media | |
| parent | 3fd5fa4ca9dbdd5be46ec2952c7038cdd59e35d5 (diff) | |
| parent | e5f853911ca05fc812ae99822f243674f3d1356a (diff) | |
| download | frameworks_base-24a2c2b59670b4d9083ff0d23c87d3910a632e7d.zip frameworks_base-24a2c2b59670b4d9083ff0d23c87d3910a632e7d.tar.gz frameworks_base-24a2c2b59670b4d9083ff0d23c87d3910a632e7d.tar.bz2 | |
Merge "Upgrade to the latest .webm project code." into gingerbread
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/VPXDecoder.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp index fbc97f4..9433178 100644 --- a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp +++ b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp @@ -29,8 +29,9 @@ #include <media/stagefright/MetaData.h> #include <media/stagefright/Utils.h> -#include "vpx_codec/vpx_decoder.h" -#include "vp8/vp8dx.h" +#include "vpx/vpx_decoder.h" +#include "vpx/vpx_codec.h" +#include "vpx/vp8dx.h" namespace android { @@ -82,9 +83,10 @@ status_t VPXDecoder::start(MetaData *) { } mCtx = new vpx_codec_ctx_t; - if (vpx_codec_dec_init( - (vpx_codec_ctx_t *)mCtx, &vpx_codec_vp8_dx_algo, NULL, 0)) { - LOGE("on2 decoder failed to initialize."); + vpx_codec_err_t vpx_err; + if ((vpx_err = vpx_codec_dec_init( + (vpx_codec_ctx_t *)mCtx, &vpx_codec_vp8_dx_algo, NULL, 0))) { + LOGE("on2 decoder failed to initialize. (%d)", vpx_err); mSource->stop(); |