commit 407b19779bdf62873a9494fbbf978edc2ea21a40
author Naveen Kumar P <naveenkumar.p@ittiam.com> Fri Nov 03 19:25:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 03 19:25:59 2017 +0000
tree ffe3e2debbae595ec58fba24dc22e8de6ced283d
parent eb84c7044092d8390f613e6727aaa8d2292f253b
parent 193030ccf0fd5a786e788a1ad4a07d3b2e60d9de

Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354
am: 193030ccf0

Change-Id: Ie2176c35fa1a7b9192c01b1a00e5de27afe8678f

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
index 1f47155..43ef4a4 100644
--- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
+++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -318,10 +318,6 @@
 
         status = ivdec_api_function(mCodecCtx, (void *)&s_create_ip, (void *)&s_create_op);
 
-        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;
-        mCodecCtx->pv_fxns = dec_fxns;
-        mCodecCtx->u4_size = sizeof(iv_obj_t);
-
         if (status != IV_SUCCESS) {
             ALOGE("Error in create: 0x%x",
                     s_create_op.s_ivd_create_op_t.u4_error_code);
@@ -329,6 +325,10 @@
             mCodecCtx = NULL;
             return UNKNOWN_ERROR;
         }
+
+        mCodecCtx = (iv_obj_t*)s_create_op.s_ivd_create_op_t.pv_handle;
+        mCodecCtx->pv_fxns = dec_fxns;
+        mCodecCtx->u4_size = sizeof(iv_obj_t);
     }
 
     /* Reset the plugin state */