diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:26:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-13 21:26:49 +0100 |
| commit | daded4f89a7762a685ae3b5119eec14fc24192a9 (patch) | |
| tree | 7bf42dc5576ed1e11229175a7c4649abe91e91bb /configure | |
| parent | 981aa023387ebfaa19ea8079e423d72cd0321b0b (diff) | |
| parent | cd832f032f945a57a1f1dd385942c2fadc7ce4e5 (diff) | |
| download | ffmpeg-daded4f89a7762a685ae3b5119eec14fc24192a9.tar.gz | |
Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'
* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
ffv1: Drop bogus dependency on dsputil
Conflicts:
configure
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1947,8 +1947,8 @@ eamad_decoder_select="aandcttables dsputil mpegvideo" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" -ffv1_decoder_select="dsputil golomb rangecoder" -ffv1_encoder_select="dsputil rangecoder" +ffv1_decoder_select="golomb rangecoder" +ffv1_encoder_select="rangecoder" ffvhuff_decoder_select="huffyuv_decoder" ffvhuff_encoder_select="huffyuv_encoder" fic_decoder_select="dsputil golomb" |