diff options
| author | Benny Prijono <bennylp@teluu.com> | 2014-04-10 10:01:07 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2014-04-10 10:01:07 +0000 |
| commit | 0aa83d8efcf477675669569b037f291464c4f146 (patch) | |
| tree | 063ff3ade6100cb7e2a0693b153045027422fc53 /build.mak.in | |
| parent | e7e444203e67583806aee77c0fc7d94115094efe (diff) | |
Re #1758: Initial implementation of OpenH264 wrapper. Supports:
- library detection via autoconf
- CBP
- packetization modes: 0, 1
- key frame request and indication
- obey remote's fmtp
Also added video codec test in samples (similar to the one in pjmedia test though).
And there are some fixes here and there too (e.g. in vid_codec_util.c).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4815 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'build.mak.in')
| -rw-r--r-- | build.mak.in | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build.mak.in b/build.mak.in index 58e9a682..07f54baf 100644 --- a/build.mak.in +++ b/build.mak.in @@ -133,7 +133,7 @@ endif SDL_CFLAGS = @ac_sdl_cflags@ SDL_LDFLAGS = @ac_sdl_ldflags@ -# FFMPEG dlags +# FFMPEG flags FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@ @@ -141,6 +141,10 @@ FFMPEG_LDFLAGS = @ac_ffmpeg_ldflags@ V4L2_CFLAGS = @ac_v4l2_cflags@ V4L2_LDFLAGS = @ac_v4l2_ldflags@ +# OPENH264 flags +OPENH264_CFLAGS = @ac_openh264_cflags@ +OPENH264_LDFLAGS = @ac_openh264_ldflags@ + # QT AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@ QT_CFLAGS = @ac_qt_cflags@ @@ -150,8 +154,9 @@ IOS_CFLAGS = @ac_ios_cflags@ # PJMEDIA features exclusion PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \ - $(IOS_CFLAGS) -PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) + $(OPENH264_CFLAGS) $(IOS_CFLAGS) +PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS) \ + $(OPENH264_LDFLAGS) # CFLAGS, LDFLAGS, and LIBS to be used by applications |