aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorHoward Chu <hyc@highlandsun.com>2010-03-28 13:39:36 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-03-28 13:39:36 +0000
commit0f943ce663de3f7a903556a0666d7cefae1c8bf2 (patch)
tree2472fe192a36b679f9760c392df7d739288a875a /libavformat/Makefile
parent9bee24595432f98411a891affd1f1ca3fb254c9f (diff)
downloadffmpeg-0f943ce663de3f7a903556a0666d7cefae1c8bf2.tar.gz
Implement support to RTMP, RTMPT, RTMPE, RTMPTE, RTMPS protocols via
librtmp. Patch by Howard Chu <hyc * highlandsun * com>. Originally committed as revision 22710 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 79430982da..3afa02831a 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -274,7 +274,12 @@ OBJS-$(CONFIG_FILE_PROTOCOL) += file.o
OBJS-$(CONFIG_GOPHER_PROTOCOL) += gopher.o
OBJS-$(CONFIG_HTTP_PROTOCOL) += http.o httpauth.o
OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
-OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.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_RTP_PROTOCOL) += rtpproto.o
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o