Commit e4b45891 authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' of git://git.linphone.org/mediastreamer2

Conflicts:
	tools/mkvstream.c
parents c75b551f 295f179b
......@@ -330,6 +330,10 @@ ifeq ($(BUILD_MEDIASTREAMER2_SDK), 1)
LOCAL_CFLAGS += -DHAVE_G729
LOCAL_STATIC_LIBRARIES += libbcg729 libmsbcg729
endif
ifeq ($(BUILD_CODEC2),1)
LOCAL_CFLAGS += -DHAVE_CODEC2
LOCAL_STATIC_LIBRARIES += libcodec2 libmscodec2
endif
ifeq ($(_BUILD_VIDEO),1)
LOCAL_STATIC_LIBRARIES += libvpx
ifeq ($(BUILD_X264),1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment