diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-05 13:26:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-05 13:26:07 +0100 |
| commit | 7dad2f7bb9753ba7a4a0cf0f69459dfec151e21c (patch) | |
| tree | 20db00a39df3e481f9b797653446ac58dd28f60d /libavformat | |
| parent | dccd648f9fa0fbf9b25244d342344a56b181b331 (diff) | |
| parent | afada9ac67a4e1f5036dcb1d5d42aaf06c2bd06b (diff) | |
| download | ffmpeg-7dad2f7bb9753ba7a4a0cf0f69459dfec151e21c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation with --disable-protocol=udp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 5eb834e757..582ec7f697 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -517,6 +517,7 @@ OBJS-$(CONFIG_SUBFILE_PROTOCOL) += subfile.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o +OBJS-$(CONFIG_UDPLITE_PROTOCOL) += udp.o OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o |