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:
879ea06
d0b2240
)
Merge commit 'd0b224054f13bf57244694a3ff092cfef68d66f9'
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 20:04:58 +0000
(21:04 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 8 Dec 2014 20:05:59 +0000
(21:05 +0100)
* commit '
d0b224054f13bf57244694a3ff092cfef68d66f9
':
vf_frei0r: do not increment string if it reached the end
See:
02a6ee51685eb74f7a878dd49553ecc1f8da9fb2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge