summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-09-15 15:13:16 -0700
committerAndreas Huber <andih@google.com>2010-09-15 15:13:16 -0700
commitacf67ea7f5ae70a093d8b164872ad1bce502f807 (patch)
treeca148466074f21108aafaa5885946a87d8723829 /media/libstagefright/codecs
parent3b93208243d6f4caab3f0b27372e95c9be8d9893 (diff)
downloadframeworks_av-acf67ea7f5ae70a093d8b164872ad1bce502f807.zip
frameworks_av-acf67ea7f5ae70a093d8b164872ad1bce502f807.tar.gz
frameworks_av-acf67ea7f5ae70a093d8b164872ad1bce502f807.tar.bz2
Upgrade to the latest .webm project code.
Change-Id: I645eff9b7c10bf33144977e6093663407af402e2
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/on2/dec/VPXDecoder.cpp12
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();