projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
99c9e00
052b978
)
Merge commit '052b97855de2396e46682bcbae97f95a258816d4'
author
Clément Bœsch
<u@pkh.me>
Fri, 24 Mar 2017 12:07:50 +0000
(13:07 +0100)
committer
Clément Bœsch
<u@pkh.me>
Fri, 24 Mar 2017 12:07:50 +0000
(13:07 +0100)
* commit '
052b97855de2396e46682bcbae97f95a258816d4
':
aviocat: Support avio options
Merged-by: Clément Bœsch <u@pkh.me>
1
2
tools/aviocat.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/aviocat.c
Simple merge