Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47f09646 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "workaround for mediaservice for sholes" into gingerbread

parents 3f1a63f7 a7f65539

media/libstagefright/omx/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ LOCAL_C_INCLUDES := $(PV_INCLUDES) 
LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)

endif



ifeq ($(TARGET_BOARD_PLATFORM),omap3)

LOCAL_CFLAGS += -DTARGET_OMAP3

endif



LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)



LOCAL_SRC_FILES:=                     \

media/libstagefright/omx/OMXMaster.cpp

+3 −0
Original line number Diff line number Diff line
@@ -87,7 +87,10 @@ void OMXMaster::addPlugin(OMXPluginBase *plugin) { 


        mPluginByComponentName.add(name8, plugin);

    }



#if !defined( TARGET_OMAP3)

    CHECK_EQ(err, OMX_ErrorNoMore);

#endif

}



void OMXMaster::clearPlugins() {