Merge commit '605387582bd35920b83a26dabbe1c0601f425621'

* commit '605387582bd35920b83a26dabbe1c0601f425621':
  lavf: Support unix sockets

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-06 15:32:12 +02:00
5 changed files with 182 additions and 0 deletions

View File

@@ -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);