[FFmpeg-cvslog] Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 15:05:18 2013 +0100| [b094931ab91108950fec221291bebcbc7b0ac12a] | committer: Michael Niedermayer

Merge commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98'

* commit '06b54e84254e4834b4978ff5b27cc2b7ee8d7a98':
  build: Fix error_resilience code dependencies

Conflicts:
	configure

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

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