[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  5 12:50:02 2013 +0200| [47ca9f041cde277f9282da8116113a7117963ab6] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
	configure

See: bf18abb2eb79c00c69f6f83ede64536e3297793c, 0915b531bc62440914710d2989813563b0446c5e

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47ca9f041cde277f9282da8116113a7117963ab6
---