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

Commit 9b46a8f9 authored by Wonsik Kim's avatar Wonsik Kim Committed by Android (Google) Code Review
Browse files

Merge "MediaCodec refactoring part 2-b: introduce BufferChannel"

parents 0567940b 11b72100
Loading
Loading
Loading
Loading
+0 −23
Original line number Diff line number Diff line
@@ -124,29 +124,6 @@ include $(BUILD_EXECUTABLE)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=         \
	sf2.cpp    \

LOCAL_SHARED_LIBRARIES := \
	libstagefright liblog libutils libbinder libstagefright_foundation \
	libmedia libgui libcutils

LOCAL_C_INCLUDES:= \
	frameworks/av/media/libstagefright \
	$(TOP)/frameworks/native/include/media/openmax

LOCAL_CFLAGS += -Wno-multichar -Werror -Wall

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE:= sf2

include $(BUILD_EXECUTABLE)

################################################################################

include $(CLEAR_VARS)

LOCAL_SRC_FILES:=               \
	codec.cpp               \
	SimplePlayer.cpp        \

cmds/stagefright/sf2.cpp

deleted100644 → 0
+0 −788

File deleted.

Preview size limit exceeded, changes collapsed.

+4 −21

File changed.

Preview size limit exceeded, changes collapsed.

+132 −55

File changed.

Preview size limit exceeded, changes collapsed.

+9 −8

File changed.

Preview size limit exceeded, changes collapsed.

Loading