git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17f2c0a
d10102d
)
Merge commit 'd10102d23c9467d4eb84f58e0cd12be284b982f6'
author
Clément Bœsch
<u@pkh.me>
Wed, 22 Mar 2017 14:50:37 +0000
(15:50 +0100)
committer
Clément Bœsch
<u@pkh.me>
Wed, 22 Mar 2017 14:50:37 +0000
(15:50 +0100)
* commit '
d10102d23c9467d4eb84f58e0cd12be284b982f6
':
avconv: set the encoding framerate when the output is CFR
This commit is a noop, see
8db301deadfcf113fb274881e65afcbe3e1bd645
Merged-by: Clément Bœsch <u@pkh.me>
Trivial merge