diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-29 23:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-29 23:24:58 +0200 |
| commit | 8a85660d3b9b610549b65cba09b4b7a1acb880bd (patch) | |
| tree | a511b94fed3587f85b46500e14fccb6b0daa9579 | |
| parent | 94a00ec8af342e037c50c64214546c7673745040 (diff) | |
| parent | 3b1ab197be185b61247ef2472f15eeac3e765252 (diff) | |
| download | ffmpeg-8a85660d3b9b610549b65cba09b4b7a1acb880bd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* 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>
0 files changed, 0 insertions, 0 deletions