diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-05 10:45:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-10 19:24:32 +0200 |
| commit | afcb67113da690dd9c56174f44a1c847ec3aa3c3 (patch) | |
| tree | d0be6ad2a62611225b2db8bda26e2f4aa6384cdf /configure | |
| parent | 7c7c5b24152d2d7e70a416019b7076f61487844e (diff) | |
| download | ffmpeg-afcb67113da690dd9c56174f44a1c847ec3aa3c3.tar.gz | |
Revert "Remove libvorbis Vorbis decoding support. Our native decoder is complete"
Its useful to support the official decoder for comparission and debugging.
This reverts commit f9def9ccc6ecfe1778d4daa62a7ada27b5f79bfc.
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/libvorbis.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -198,7 +198,7 @@ External library support: --enable-libv4l2 enable libv4l2/v4l-utils [no] --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no] --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no] - --enable-libvorbis enable Vorbis encoding via libvorbis, + --enable-libvorbis enable Vorbis en/decoding via libvorbis, native implementation exists [no] --enable-libvpx enable VP8 support via libvpx [no] --enable-libx264 enable H.264 encoding via x264 [no] @@ -1578,6 +1578,7 @@ libstagefright_h264_decoder_deps="libstagefright_h264" libtheora_encoder_deps="libtheora" libvo_aacenc_encoder_deps="libvo_aacenc" libvo_amrwbenc_encoder_deps="libvo_amrwbenc" +libvorbis_decoder_deps="libvorbis" libvorbis_encoder_deps="libvorbis" libvpx_decoder_deps="libvpx" libvpx_encoder_deps="libvpx" |