* qatar/master: h264: Make it possible to compile without error_resilience Conflicts: configure libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>