* commit '605387582bd35920b83a26dabbe1c0601f425621': lavf: Support unix sockets Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>