diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 16:50:12 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-15 20:20:17 +0400 |
commit | 2c7d3ecfc962fe2d2afa84cd347136060468fe0e (patch) | |
tree | c41ba636d60abccf4acaab315de41823967a033e /configure | |
parent | 8b96f31817be57f0542834e7d6bdaecf2db6fd50 (diff) | |
parent | b70d7a4ac72d23f3448f3b08b770fdf5f57de222 (diff) |
Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222':
lavc: add a native Opus decoder.
Conflicts:
Changelog
configure
libavcodec/version.h
Fate tests pass with both avresample as well as swresample based opus decoder, but
are disabled (reference files are very large so i want to think a day or 2 about
if theres an alternative or if they could be avoided, they also dont match the
official samples)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2110,6 +2110,7 @@ nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" nuv_decoder_select="dsputil lzo" on2avc_decoder_select="mdct" +opus_decoder_deps="avresample" png_decoder_select="zlib" png_encoder_select="dsputil zlib" prores_decoder_select="dsputil" @@ -5139,6 +5140,8 @@ enabled subtitles_filter && prepend avfilter_deps "avformat avcodec" enabled lavfi_indev && prepend avdevice_deps "avfilter" +enabled opus_decoder && prepend avcodec_deps "avresample" + expand_deps(){ lib_deps=${1}_deps eval "deps=\$$lib_deps" |