Commit 4064390b authored by François Grisez's avatar François Grisez

Build mkv_recorder and mkv_player filters for Android

parent c894818d
......@@ -76,6 +76,7 @@ LOCAL_SRC_FILES = \
otherfilters/tee.c \
otherfilters/join.c \
otherfilters/void.c \
otherfilters/itc.c \
audiofilters/audiomixer.c \
audiofilters/alaw.c \
audiofilters/ulaw.c \
......@@ -157,12 +158,18 @@ LOCAL_SRC_FILES+= \
endif
ifeq ($(BUILD_MATROSKA), 1)
LOCAL_CFLAGS += -DHAVE_MATROSKA
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/../../../externals/build/libebml2/include \
$(LOCAL_PATH)/../../../externals/build/libmatroska/include
LOCAL_SRC_FILES += \
videofilters/mkv.c
LOCAL_STATIC_LIBRARIES += \
libebml2 \
libmatroska2
endif #BUILD_MATROSKA
endif #_BUILD_VIDEO
......
......@@ -44,7 +44,8 @@ extern MSFilterDesc ms_opus_dec_desc;
extern MSFilterDesc ms_opus_enc_desc;
extern MSFilterDesc ms_mkv_recorder_desc;
extern MSFilterDesc ms_mkv_player_desc;
extern MSFilterDesc ms_itc_source_desc;
extern MSFilterDesc ms_itc_sink_desc;
MSFilterDesc * ms_voip_filter_descs[]={
&ms_alaw_dec_desc,
......@@ -82,7 +83,7 @@ MSFilterDesc * ms_voip_filter_descs[]={
&ms_vp8_enc_desc,
&ms_vp8_dec_desc,
&ms_jpeg_writer_desc,
#ifdef BUILD_MATROSKA
#ifdef HAVE_MATROSKA
&ms_mkv_recorder_desc,
&ms_mkv_player_desc,
#endif
......@@ -94,6 +95,8 @@ MSFilterDesc * ms_voip_filter_descs[]={
&ms_opus_dec_desc,
&ms_opus_enc_desc,
#endif
&ms_itc_source_desc,
&ms_itc_sink_desc,
NULL
};
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