From 40b5cb7899e824f2304cd9ba0655b0b2207bb01a Mon Sep 17 00:00:00 2001 From: Keith Mok Date: Wed, 2 Dec 2015 14:56:18 -0800 Subject: stagefright: Fix build breaks Fix build breaks on non QCOM_HARDWARE device Change-Id: I4671fa21cc7836172d356a83381dc80ee6b18f03 --- media/libstagefright/FFMPEGSoftCodec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/FFMPEGSoftCodec.cpp') diff --git a/media/libstagefright/FFMPEGSoftCodec.cpp b/media/libstagefright/FFMPEGSoftCodec.cpp index 3e51322..101d765 100644 --- a/media/libstagefright/FFMPEGSoftCodec.cpp +++ b/media/libstagefright/FFMPEGSoftCodec.cpp @@ -355,11 +355,11 @@ status_t FFMPEGSoftCodec::setVideoFormat( return err; } +#ifdef QCOM_HARDWARE status_t FFMPEGSoftCodec::setQCDIVXFormat( const sp &msg, const char* mime, sp OMXhandle, IOMX::node_id nodeID, int port_index) { status_t err = OK; -#ifdef QCOM_HARDWARE if (!strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX, mime) || !strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX4, mime) || !strcasecmp(MEDIA_MIMETYPE_VIDEO_DIVX311, mime)) { @@ -391,9 +391,9 @@ status_t FFMPEGSoftCodec::setQCDIVXFormat( (OMX_INDEXTYPE)OMX_QcomIndexParamVideoDivx, ¶mDivX, sizeof(paramDivX)); } -#endif return err; } +#endif status_t FFMPEGSoftCodec::getVideoPortFormat(OMX_U32 portIndex, int coding, sp ¬ify, sp OMXHandle, IOMX::node_id nodeId) { -- cgit v1.1