OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94a00ec
3b1ab19
)
Merge remote-tracking branch 'qatar/master'
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 29 Jun 2012 21:24:58 +0000
(23:24 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 29 Jun 2012 21:24:58 +0000
(23:24 +0200)
* qatar/master:
file: Only include unistd.h if it exists
random_seed: Only read /dev/*random if we have unistd.h
doc: Indicate that RTMPT is natively implemented in libavformat
rtpdec: Don't explicitly include unistd.h any longer
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge