OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
51fb933
4d58e4c
)
NoMerge commit '4d58e4cb4ca8e04317fecea432ea3272a445877c'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 10 Aug 2011 14:28:12 +0000
(16:28 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 10 Aug 2011 14:29:20 +0000
(16:29 +0200)
* commit '
4d58e4cb4ca8e04317fecea432ea3272a445877c
':
Rename ffserver to avserver.
Rename ffprobe to avprobe.
Rename ffplay to avplay.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
ffplay.c
patch
|
diff1
|
diff2
|
blob
|
history
ffprobe.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
ffplay.c
Simple merge
diff --cc
ffprobe.c
Simple merge
OSDN Git Service
