[FFmpeg-cvslog] Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  8 15:23:56 2013 +0100| [c32cc7e3a40d8449a876938655c0d8ac715b2772] | committer: Michael Niedermayer

Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'

* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
	configure
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c

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

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