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)
* qatar/master:
  error_resilience: add required headers.

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

Simple merge