ref: 73d27e9776cbc977a74134782b80b103fe251b08
parent: bef3d87f34b4402a67e57a869a2f491454686f9f
parent: 810d20a59d5734f3e768b45a2977a41fff2b23a4
author: ruil2 <[email protected]>
date: Thu Sep 25 09:05:25 EDT 2014
Merge pull request #1386 from huili2/UT_bugfix_dataformat bug fix for dataformat UT
--- a/test/decoder/DecUT_DecExt.cpp
+++ b/test/decoder/DecUT_DecExt.cpp
@@ -86,7 +86,7 @@
m_szBuffer[3] = 1;
m_iBufLength = 4;
CM_RETURN eRet = (CM_RETURN) m_pDec->Initialize (&m_sDecParam);
- if ((m_sDecParam.eOutputColorFormat != videoFormatI420) ||
+ if ((m_sDecParam.eOutputColorFormat != videoFormatI420) &&
(m_sDecParam.eOutputColorFormat != videoFormatInternal))
ASSERT_EQ (eRet, cmUnsupportedData);
else