[FFmpeg-cvslog] Merge commit '605387582bd35920b83a26dabbe1c0601f425621'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 15:32:12 2013 +0200| [8d06ce79411fc99d200ddc559bf1dd1f1434a13c] | committer: Michael Niedermayer

Merge commit '605387582bd35920b83a26dabbe1c0601f425621'

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

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d06ce79411fc99d200ddc559bf1dd1f1434a13c
---