projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5c67c4
2224120
)
Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'
author
James Almer
<jamrial@gmail.com>
Sun, 12 Nov 2017 03:50:24 +0000
(
00:50
-0300)
committer
James Almer
<jamrial@gmail.com>
Sun, 12 Nov 2017 03:50:24 +0000
(
00:50
-0300)
* commit '
22241208eb7d0168b2afc128af5a128a9ef0a89b
':
avconv.c: fix calculation of input file duration in seek_to_start()
This commit is a noop, see
3ddb887c88483ce089b29a30d0d0aa574c8cdc66
Merged-by: James Almer <jamrial@gmail.com>
Trivial merge