summaryrefslogtreecommitdiff
path: root/pjmedia/build
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2012-03-22 09:56:52 +0000
committerBenny Prijono <bennylp@teluu.com>2012-03-22 09:56:52 +0000
commited4644930dd8a74bcf4d4a89298a907643bd5d30 (patch)
treed2244ba52cc6fe2eb3dff9732a39b9b11eea825f /pjmedia/build
parent5bef8e17b3b0ffcfa59ad195787c956903b81978 (diff)
Re: #1463 (Third party media support). Tnitial work and it works, tested on Linux. Details:
* add PJSUA_MEDIA_HAS_PJMEDIA macro * move pjmedia specific implementation in pjsua_media.c and pjsua_call.c into pjsua_aud.c * add pjsip-apps/src/third_party_media sample containing: - alt_pjsua_aud.c - alt_pjsua_vid.c * moved pjmedia_vid_stream_info_from_sdp() into pjmedia/vid_stream_info.c * moved pjmedia_stream_info_from_sdp() into pjmedia/stream_info.c * misc: fixed mips_test.c if codecs are disabled git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3982 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/build')
-rw-r--r--pjmedia/build/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index 3357efb8..5e36fc5d 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -64,11 +64,11 @@ export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
resample_resample.o resample_libsamplerate.o \
resample_port.o rtcp.o rtcp_xr.o rtp.o \
sdp.o sdp_cmp.o sdp_neg.o session.o silencedet.o \
- sound_legacy.o sound_port.o stereo_port.o \
- stream_common.o stream.o tonegen.o transport_adapter_sample.o \
+ sound_legacy.o sound_port.o stereo_port.o stream_common.o \
+ stream.o stream_info.o tonegen.o transport_adapter_sample.o \
transport_ice.o transport_loop.o transport_srtp.o transport_udp.o \
types.o vid_codec.o vid_codec_util.o \
- vid_port.o vid_stream.o vid_tee.o \
+ vid_port.o vid_stream.o vid_stream_info.o vid_tee.o \
wav_player.o wav_playlist.o wav_writer.o wave.o \
wsola.o