Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:23:56 +0000 (15:23 +0100)
commitc32cc7e3a40d8449a876938655c0d8ac715b2772
treeef15553d84eb1b6be4f1efe978be846d384ee849
parent43c6c1869011a4253841a99693e862ce57ecda5b
parentbcd0a7137e4aca0f6f598593b90ca8f338444c51
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>
configure
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/intrax8.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mss2.c
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/vc1dec.c