diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:10:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:11:33 +0200 |
| commit | 69ea65b46f1a101f9a4f2c914c75b752122e7cbe (patch) | |
| tree | 19e9bfa95c01a5739802ddd1704e1486a6cbd4ad /configure | |
| parent | a0fb6083967afcd7f2c43ab3ff1e510912644daa (diff) | |
| parent | 3e5898782dce60334ab294821ca00b19c648cf66 (diff) | |
| download | ffmpeg-69ea65b46f1a101f9a4f2c914c75b752122e7cbe.tar.gz | |
Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'
* commit '3e5898782dce60334ab294821ca00b19c648cf66':
Voxware MetaSound decoder
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1809,6 +1809,7 @@ lagarith_decoder_select="dsputil" ljpeg_encoder_select="aandcttables mpegvideoenc" loco_decoder_select="golomb" mdec_decoder_select="dsputil error_resilience mpegvideo" +metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="dsputil hpeldsp" mjpeg_decoder_select="dsputil hpeldsp" mjpegb_decoder_select="dsputil hpeldsp" |