diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-02-13 19:37:25 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-02-14 11:37:01 +0100 |
| commit | c3b57d6e76cd3df87652639405505b7de5746ca8 (patch) | |
| tree | f96961335199f7f2e6d5ed9d9f158ad3c13386b2 /libavformat/Makefile | |
| parent | df6050188c5bfa4dd7eed62a662506187810249b (diff) | |
| download | ffmpeg-c3b57d6e76cd3df87652639405505b7de5746ca8.tar.gz | |
librtmp: Add "lib" prefix to librtmp URLProtocol declarations.
This allows easily differentiating between both implementations within the build
system and combining the native implementation for plain RTMP with librtmp for
the RTMPE, RTMPS, RTMPT, RTMPTE protocol variants.
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 0d6cb91e49..a465b2f44e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -323,6 +323,7 @@ OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o # external libraries OBJS-$(CONFIG_LIBNUT_DEMUXER) += libnut.o OBJS-$(CONFIG_LIBNUT_MUXER) += libnut.o +OBJS-$(CONFIG_LIBRTMP) += librtmp.o # protocols I/O OBJS+= avio.o aviobuf.o @@ -339,12 +340,7 @@ OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o - -# external or internal rtmp -RTMP-OBJS-$(CONFIG_LIBRTMP) = librtmp.o -RTMP-OBJS-$(!CONFIG_LIBRTMP) = rtmpproto.o rtmppkt.o -OBJS-$(CONFIG_RTMP_PROTOCOL) += $(RTMP-OBJS-yes) - +OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o |