diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 05:11:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 05:11:37 +0100 |
| commit | c4c2b2ea5c0a1879f512c2023956d7322edc98d3 (patch) | |
| tree | 8967a82887bfff277faf03560514f78fe81bc780 /configure | |
| parent | 5aab33dea38ee262d6345e8348a184609a2ee46e (diff) | |
| parent | 0a36988e48dd581d29e77f768f987738bdf365f0 (diff) | |
| download | ffmpeg-c4c2b2ea5c0a1879f512c2023956d7322edc98d3.tar.gz | |
Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
build: Let AMV decoder depend on the SP5X decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1889,7 +1889,7 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" -amv_decoder_select="dsputil hpeldsp exif" +amv_decoder_select="sp5x_decoder exif" amv_encoder_select="aandcttables" ape_decoder_select="dsputil" asv1_decoder_select="dsputil" |