Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Feb 2013 13:24:01 +0000 (14:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Feb 2013 13:24:09 +0000 (14:24 +0100)
commit59e46ef63ab478b9ad46fc7aefc2937692afc807
treeffe043bf049c86181db65c61561b3eb7aed2ae1d
parentf3147917bf0067356776839152fcf7d85c88b8a9
parent1f8f43a5b5e9b966d364d1d2d6ed741f07dcceaa
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error_resilience: add required headers.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/error_resilience.h