Michael Niedermayer c32cc7e3a4 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@gmx.at>

2013-03-08 15:23:56 +01:00

27 KiB

Raw Blame History

View Raw