diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:32:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:33:12 +0200 |
| commit | 8d06ce79411fc99d200ddc559bf1dd1f1434a13c (patch) | |
| tree | 9332563780b673ce8695945f8232b28923007ce4 /libavformat/Makefile | |
| parent | 560e9365b6eb6ce34eddea1a582047e09022fcb0 (diff) | |
| parent | 605387582bd35920b83a26dabbe1c0601f425621 (diff) | |
Merge commit '605387582bd35920b83a26dabbe1c0601f425621'
* commit '605387582bd35920b83a26dabbe1c0601f425621':
lavf: Support unix sockets
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/Makefile')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index db1ac2493f..dbfdecb15b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -453,6 +453,7 @@ OBJS-$(CONFIG_SRTP_PROTOCOL) += srtpproto.o srtp.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h |