Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 216e3441 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

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

Merge commit 'f8297ba0'

* commit 'f8297ba0':
  Upgrade to the latest .webm project code.
parents 606c3de5 f8297ba0

media/libstagefright/codecs/on2/dec/VPXDecoder.cpp

+7 −5
Original line number Original line Diff line number Diff line
@@ -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();