From e5f853911ca05fc812ae99822f243674f3d1356a Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 15 Sep 2010 15:13:16 -0700 Subject: [PATCH] Upgrade to the latest .webm project code. Change-Id: I645eff9b7c10bf33144977e6093663407af402e2 --- media/libstagefright/codecs/on2/dec/VPXDecoder.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp index fbc97f47cddd9..9433178c0b8c7 100644 --- a/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp +++ b/media/libstagefright/codecs/on2/dec/VPXDecoder.cpp @@ -29,8 +29,9 @@ #include #include -#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();