diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:20:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:20:41 +0100 |
| commit | e63ebaca16b7620441dda9e21b8773ef7e7ae2df (patch) | |
| tree | 7a7e6aec593144fcb3b27767d2b31d13d4cbf9da /configure | |
| parent | dac1d92cb75733e3eb1431eac4867449e06b6c7a (diff) | |
| parent | e9cc98839574c7e8d546e890ebbf57d1766e5d8a (diff) | |
| download | ffmpeg-e63ebaca16b7620441dda9e21b8773ef7e7ae2df.tar.gz | |
Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'
* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
win32: Allow other programs to open the same files
configure: Add error_resilience as dependency to the eatqi decoder
Conflicts:
configure
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1716,7 +1716,7 @@ eac3_decoder_select="ac3_decoder" eac3_encoder_select="ac3_encoder" eamad_decoder_select="aandcttables dsputil mpegvideo" eatgq_decoder_select="aandcttables" -eatqi_decoder_select="aandcttables mpegvideo" +eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="dsputil golomb rangecoder" ffv1_encoder_select="rangecoder" |