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/allformats.c | |
| 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/allformats.c')
| -rw-r--r-- | libavformat/allformats.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6bba81241c..b3b2a3bba5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -335,6 +335,7 @@ void av_register_all(void) REGISTER_PROTOCOL(TCP, tcp); REGISTER_PROTOCOL(TLS, tls); REGISTER_PROTOCOL(UDP, udp); + REGISTER_PROTOCOL(UNIX, unix); /* external libraries */ REGISTER_DEMUXER (LIBGME, libgme); |