OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c634cb
9f4b55e
)
Merge remote-tracking branch 'lukaszmluki/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Feb 2014 01:14:17 +0000
(
02:14
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 28 Feb 2014 01:14:22 +0000
(
02:14
+0100)
* lukaszmluki/master:
lavf/ftp: fix seek to nagative position
lavf/libssh: fix seek to nagative position
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge