Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 24a2c2b5: Merge "Upgrade to the latest .webm project code." into gingerbread

Browse Source 
Merge commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d' into gingerbread-plus-aosp

* commit '24a2c2b59670b4d9083ff0d23c87d3910a632e7d':
  Upgrade to the latest .webm project code.
This commit is contained in:
Andreas Huber
2010-09-15 17:24:53 -07:00
committed by Android Git Automerger
parent d63d74749f 24a2c2b596
commit f8297ba011
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/libstagefright/codecs/on2/dec/VPXDecoder.cpp
View File

@@ -29,8 +29,9 @@
#include <media/stagefright/MetaData.h> #include <media/stagefright/MetaData.h>
#include <media/stagefright/Utils.h> #include <media/stagefright/Utils.h>
#include "vpx_codec/vpx_decoder.h" #include "vpx/vpx_decoder.h"
#include "vp8/vp8dx.h" #include "vpx/vpx_codec.h"
#include "vpx/vp8dx.h"
namespace android { namespace android {
@@ -82,9 +83,10 @@ status_t VPXDecoder::start(MetaData *) {
} }
mCtx = new vpx_codec_ctx_t; mCtx = new vpx_codec_ctx_t;
if (vpx_codec_dec_init( vpx_codec_err_t vpx_err;
(vpx_codec_ctx_t *)mCtx, &vpx_codec_vp8_dx_algo, NULL, 0)) { if ((vpx_err = vpx_codec_dec_init(
LOGE("on2 decoder failed to initialize."); (vpx_codec_ctx_t *)mCtx, &vpx_codec_vp8_dx_algo, NULL, 0))) {
LOGE("on2 decoder failed to initialize. (%d)", vpx_err);
mSource->stop(); mSource->stop();