[FFmpeg-cvslog] Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  3 09:27:37 2013 +0200| [85fc1a18ca7b875cf138d3a862779f8334fb2a57] | committer: Michael Niedermayer

Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'

* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
	configure

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

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