diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 21:10:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-29 21:11:03 +0100 |
| commit | 12fc0c89dc6b4f092b14f297f29dfd73fe31fecf (patch) | |
| tree | 756d72173b81329ea163ea457c2b55e923d13f53 /ffprobe.c | |
| parent | 828ac6d1b515ce421519a641b23b05127acc06cd (diff) | |
| parent | 8ba77dfbc2e04c6d1070a8ea57f3dbbf477b95a7 (diff) | |
| download | ffmpeg-12fc0c89dc6b4f092b14f297f29dfd73fe31fecf.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/libssh: improve authentication
lavf/libssh: fix file mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions