diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 18:23:56 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 18:23:56 +0400 |
commit | c32cc7e3a40d8449a876938655c0d8ac715b2772 (patch) | |
tree | ef15553d84eb1b6be4f1efe978be846d384ee849 /configure | |
parent | 43c6c1869011a4253841a99693e862ce57ecda5b (diff) | |
parent | bcd0a7137e4aca0f6f598593b90ca8f338444c51 (diff) |
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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1797,8 +1797,8 @@ vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="mdct" vp3_decoder_select="vp3dsp videodsp" -vp5_decoder_select="h264chroma vp3dsp videodsp" -vp6_decoder_select="h264chroma huffman vp3dsp videodsp" +vp5_decoder_select="h264chroma videodsp vp3dsp" +vp6_decoder_select="h264chroma huffman videodsp vp3dsp" vp6a_decoder_select="vp6_decoder" vp6f_decoder_select="vp6_decoder" vp8_decoder_select="h264pred videodsp" |