diff options
| author | Keith Mok <kmok@cyngn.com> | 2015-12-02 14:56:18 -0800 |
|---|---|---|
| committer | Keith Mok <kmok@cyngn.com> | 2015-12-02 15:01:56 -0800 |
| commit | 40b5cb7899e824f2304cd9ba0655b0b2207bb01a (patch) | |
| tree | 40d888dd239fb232747ac40a8f7de42d638e7b39 /media/libstagefright/FFMPEGSoftCodec.cpp | |
| parent | 53f30099f701ef110ad7f16c4bec0c26eff9457a (diff) | |
| download | frameworks_av-40b5cb7899e824f2304cd9ba0655b0b2207bb01a.zip frameworks_av-40b5cb7899e824f2304cd9ba0655b0b2207bb01a.tar.gz frameworks_av-40b5cb7899e824f2304cd9ba0655b0b2207bb01a.tar.bz2 | |
stagefright: Fix build breaks
Fix build breaks on non QCOM_HARDWARE device
Change-Id: I4671fa21cc7836172d356a83381dc80ee6b18f03
Diffstat (limited to 'media/libstagefright/FFMPEGSoftCodec.cpp')
| -rw-r--r-- | media/libstagefright/FFMPEGSoftCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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<AMessage> &msg, const char* mime, sp<IOMX> 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<AMessage> ¬ify, sp<IOMX> OMXHandle, IOMX::node_id nodeId) { |