* commit 'c5fcdb44':
  error_resilience: remove a useless if() and FIXME
  h264: remove silly macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>