diff options
| author | ywan171 <yi.a.wang@intel.com> | 2013-04-28 15:54:07 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:02:53 -0700 |
| commit | c9d4c8ce4a28d852e006427a1f01ee334e022938 (patch) | |
| tree | fbcd47dd02d700bb6b6c2cbdb815ad8396c97c6d /videocodec/OMXVideoEncoderAVC.cpp | |
| parent | 2b372395e53b30dec2fb8171cbc950e80fc64b06 (diff) | |
| download | android_hardware_intel_common_omx-components-c9d4c8ce4a28d852e006427a1f01ee334e022938.tar.gz android_hardware_intel_common_omx-components-c9d4c8ce4a28d852e006427a1f01ee334e022938.tar.bz2 android_hardware_intel_common_omx-components-c9d4c8ce4a28d852e006427a1f01ee334e022938.zip | |
[PDK MR2 ABSP] this change is caused by removing duplicate omx header file between khronos and google framework in wrs_core
BZ: 117349
Change-Id: I3f7c8d3fb7044512d7589120d56054f6ab76dade
Signed-off-by: ywan171 <yi.a.wang@intel.com>
Diffstat (limited to 'videocodec/OMXVideoEncoderAVC.cpp')
| -rwxr-xr-x | videocodec/OMXVideoEncoderAVC.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/videocodec/OMXVideoEncoderAVC.cpp b/videocodec/OMXVideoEncoderAVC.cpp index 128cf56..ddc94ad 100755 --- a/videocodec/OMXVideoEncoderAVC.cpp +++ b/videocodec/OMXVideoEncoderAVC.cpp @@ -401,9 +401,9 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::ProcessDataRetrieve( // NaluFormat not set, setting default if (NaluFormat == 0) { if (mStoreMetaDataInBuffers) { - NaluFormat = OMX_NaluFormatLengthPrefixedSeparateFirstHeader; + NaluFormat = (OMX_NALUFORMATSTYPE)OMX_NaluFormatLengthPrefixedSeparateFirstHeader; } else { - NaluFormat = OMX_NaluFormatStartCodesSeparateFirstHeader; + NaluFormat = (OMX_NALUFORMATSTYPE)OMX_NaluFormatStartCodesSeparateFirstHeader; } mNalStreamFormat.eNaluFormat = NaluFormat; } @@ -1042,7 +1042,7 @@ OMX_ERRORTYPE OMXVideoEncoderAVC::SetParamVideoBytestream(OMX_PTR pStructure) { mNalStreamFormat.eNaluFormat = OMX_NaluFormatStartCodes; } else { // TODO: do we need to override the Nalu format? - mNalStreamFormat.eNaluFormat = OMX_NaluFormatZeroByteInterleaveLength; + mNalStreamFormat.eNaluFormat = (OMX_NALUFORMATSTYPE)OMX_NaluFormatZeroByteInterleaveLength; } return OMX_ErrorNone; |