diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:40:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:40:41 +0100 |
| commit | cbfc9046e1c7e295b74f252902ae6f255eef4e78 (patch) | |
| tree | c7324363f40c83bbab3cd21a697ebfe982eeaf62 | |
| parent | 96b02460fce59edca54fa2992c2d6e431596df9e (diff) | |
| parent | bbb64356cca65d7a2a33f59b2267ee58f28a061a (diff) | |
| download | ffmpeg-cbfc9046e1c7e295b74f252902ae6f255eef4e78.tar.gz | |
Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'
* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a':
build: Record dependency of eatqi decoder on dsputil
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1945,7 +1945,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 error_resilience mpegvideo" +eatqi_decoder_select="aandcttables dsputil error_resilience mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="golomb rangecoder" ffv1_encoder_select="rangecoder" |