diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2005-05-17 19:02:43 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2005-05-17 19:02:43 +0000 |
commit | 0bde73d907dbe684e01bafc979bf4a04ddeace1d (patch) | |
tree | 8dd3d756524d217cee36e8ab18d59a52b1b94fcc /libavcodec/allcodecs.c | |
parent | 5773a746695f445805291d3aa74fa82e948825f2 (diff) | |
download | ffmpeg-0bde73d907dbe684e01bafc979bf4a04ddeace1d.tar.gz |
Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu)
Originally committed as revision 4261 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/allcodecs.c')
-rw-r--r-- | libavcodec/allcodecs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b439bbd090..db131ad539 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -55,7 +55,7 @@ void avcodec_register_all(void) #ifdef CONFIG_OGGVORBIS_ENCODER register_avcodec(&oggvorbis_encoder); #endif //CONFIG_OGGVORBIS_ENCODER -#ifdef CONFIG_OGGVORBIS_DECODER +#if (defined CONFIG_OGGVORBIS_DECODER && !defined CONFIG_VORBIS_DECODER) register_avcodec(&oggvorbis_decoder); #endif //CONFIG_OGGVORBIS_DECODER #endif @@ -476,6 +476,9 @@ void avcodec_register_all(void) #ifdef CONFIG_WS_SND1_DECODER register_avcodec(&ws_snd1_decoder); #endif //CONFIG_WS_SND1_DECODER +#ifdef CONFIG_VORBIS_DECODER + register_avcodec(&vorbis_decoder); +#endif #endif /* CONFIG_DECODERS */ #ifdef AMR_NB |