From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 29 Jun 2012 21:24:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'qatar/master'
X-Git-Tag: android-x86-4.4-r1~10938
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a85660d3b9b610549b65cba09b4b7a1acb880bd;p=android-x86%2Fexternal-ffmpeg.git

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>
---

8a85660d3b9b610549b65cba09b4b7a1acb880bd