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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 17 14:24:01 2013 +0100| [59e46ef63ab478b9ad46fc7aefc2937692afc807] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error_resilience: add required headers.

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

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