diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 02:14:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-28 02:14:22 +0100 |
| commit | e8e91a32e5ce3f7bc57634597684da8dcb334aec (patch) | |
| tree | b60a45aa0a52d550f1753d3ecae161cef4d81f83 /libavfilter | |
| parent | 5c634cbeb7b463e00ae2f2fa225a15b5b94c27be (diff) | |
| parent | 9f4b55ef49c1525080507f5eaeef91091d243e16 (diff) | |
| download | ffmpeg-e8e91a32e5ce3f7bc57634597684da8dcb334aec.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavf/ftp: fix seek to nagative position
lavf/libssh: fix seek to nagative position
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions