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)
commit7f23b2a9d0da328e6939de87a0ef509842b3a907
tree1af3172fb0bc945b690e5ea2623672b19a1b51e8
parentd5518545d1b6df40d71e43dab8ada97710273db3
parentc5fcdb440237f06f6c954185ab60970cabf786a2
Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'

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

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