commit 4e17cadf82430e329bef100e7c3960d43017455f
author Naveen Kumar P <naveenkumar.p@ittiam.com> Fri Nov 03 19:43:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Nov 03 19:43:23 2017 +0000
tree af8330f80db9656df555822b15ea0b8d42ff5daa
parent 6918a8511f50ad180a912439af1709525f58b6b4
parent f6c6cc0d1d1b3bd4f20bbe3a7b42b15b64cd5903

Merge "Access AVCDEC context after create fail check" into mnc-dr-dev am: eba5ad1a07 am: ba9840c1ce am: 6fd437edf7 am: b334ac03d9 am: a61eab4354 am: 193030ccf0 am: 407b19779b am: 7fc9b2250c am: af7531a478 am: 92fefbd90b
am: f6c6cc0d1d

Change-Id: Id3978a47c22906ae74e9ca1b49eb8369c54ce44e

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
index 70df501..dae6e79 100644
--- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
+++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -274,10 +274,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);
@@ -285,6 +281,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 */