diff options
| author | James Dong <jdong@google.com> | 2009-09-28 13:27:45 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2009-09-28 13:40:19 -0700 |
| commit | c22b4b5a6da81c52ed4aca4e0c9fec348d5f0adc (patch) | |
| tree | 1c67d80ba6ce4980830c74d00d10ed42eeb01352 /omx/image | |
| parent | faff08b9b15c78b7a78edb8bac614ca41f4d044f (diff) | |
| download | omap3-c22b4b5a6da81c52ed4aca4e0c9fec348d5f0adc.tar.gz | |
Remork - Abort Assert Exit Rework
Fixed a typo in the patch 27455
Diffstat (limited to 'omx/image')
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c | 3 | ||||
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c b/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c index 36ef92d..bd3e6c8 100644 --- a/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c +++ b/omx/image/src/openmax_il/jpeg_dec/src/OMX_JpegDec_Thread.c @@ -129,6 +129,7 @@ void* OMX_JpegDec_Thread (void* pThreadData) OMX_ErrorInsufficientResources, OMX_TI_ErrorSevere, "Error from COmponent Thread in select"); + eError = OMX_ErrorInsufficientResources; goto EXIT; } else { @@ -254,7 +255,7 @@ EXIT: #ifdef __PERF_INSTRUMENTATION__ PERF_Done(pComponentPrivate->pPERFcomp); #endif - return(void*)OMX_ErrorNone; + return(void*)eError; } diff --git a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c index e50a556..813596f 100644 --- a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c +++ b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Thread.c @@ -149,7 +149,8 @@ void* OMX_JpegEnc_Thread (void* pThreadData) pComponentPrivate->cbInfo.EventHandler (pComponentPrivate->pHandle, pComponentPrivate->pHandle->pApplicationPrivate, OMX_EventError, OMX_ErrorInsufficientResources, OMX_TI_ErrorSevere, "Error from COmponent Thread in select"); - exit(1); + eError = OMX_ErrorInsufficientResources; + break; } else { if ( (FD_ISSET (pComponentPrivate->filled_inpBuf_Q[0], &rfds)) |