projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
756f865
0f1fb6c
)
Merge commit '0f1fb6c0194c85483dedb93b20a5b76f6fc9d520'
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 8 Aug 2013 09:54:10 +0000
(11:54 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 8 Aug 2013 09:54:14 +0000
(11:54 +0200)
* commit '
0f1fb6c0194c85483dedb93b20a5b76f6fc9d520
':
libavutil: Don't use fcntl if the function does not exist
cmdutils: Only do the windows-specific commandline parsing on _WIN32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1
2
cmdutils.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
cmdutils.c
Simple merge