[FFmpeg-cvslog] Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb  7 13:48:56 2013 +0100| [7f23b2a9d0da328e6939de87a0ef509842b3a907] | committer: Michael Niedermayer

Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'

* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
  error_resilience: remove a useless if() and FIXME
  h264: remove silly macros

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

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