Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:48:56 +0000 (13:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Feb 2013 12:49:04 +0000 (13:49 +0100)
* commit 'c5fcdb440237f06f6c954185ab60970cabf786a2':
  error_resilience: remove a useless if() and FIXME
  h264: remove silly macros

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

Simple merge
Simple merge