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 /libswscale/ppc | |
| parent | 560e9365b6eb6ce34eddea1a582047e09022fcb0 (diff) | |
| parent | 605387582bd35920b83a26dabbe1c0601f425621 (diff) | |
| download | ffmpeg-8d06ce79411fc99d200ddc559bf1dd1f1434a13c.tar.gz | |
Merge commit '605387582bd35920b83a26dabbe1c0601f425621'
* commit '605387582bd35920b83a26dabbe1c0601f425621':
lavf: Support unix sockets
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/ppc')
0 files changed, 0 insertions, 0 deletions