projects / ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 94a00ec 3b1ab19)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Jun 2012 21:24:58 +0000 (23:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 Jun 2012 21:24:58 +0000 (23:24 +0200)
commit8a85660d3b9b610549b65cba09b4b7a1acb880bd
treea511b94fed3587f85b46500e14fccb6b0daa9579tree | snapshot
parent94a00ec8af342e037c50c64214546c7673745040commit | diff
parent3b1ab197be185b61247ef2472f15eeac3e765252commit | diff
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>
FFmpeg git repo