# HG changeset patch # User diego # Date 1178237934 0 # Node ID 6406b4e280d637bf9eec42d58d6bc4ee5399c5d6 # Parent 36051a4c182adc2a160d5b6df26e5e151537e516 Rename oggvorbis decoder to libvorbis. diff -r 36051a4c182a -r 6406b4e280d6 allcodecs.c --- a/allcodecs.c Fri May 04 00:09:33 2007 +0000 +++ b/allcodecs.c Fri May 04 00:18:54 2007 +0000 @@ -179,6 +179,8 @@ REGISTER_ENCDEC (LIBGSM, libgsm); REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); REGISTER_ENCODER(LIBTHEORA, libtheora); + if (!ENABLE_VORBIS_ENCODER) REGISTER_ENCODER(LIBVORBIS, libvorbis); + if (!ENABLE_VORBIS_DECODER) REGISTER_DECODER(LIBVORBIS, libvorbis); REGISTER_DECODER(MACE3, mace3); REGISTER_DECODER(MACE6, mace6); REGISTER_ENCDEC (MP2, mp2); @@ -187,8 +189,6 @@ REGISTER_ENCODER(MP3LAME, mp3lame); REGISTER_DECODER(MP3ON4, mp3on4); REGISTER_DECODER(MPC7, mpc7); - if (!ENABLE_VORBIS_ENCODER) REGISTER_ENCODER(OGGVORBIS, oggvorbis); - if (!ENABLE_VORBIS_DECODER) REGISTER_DECODER(OGGVORBIS, oggvorbis); REGISTER_DECODER(QDM2, qdm2); REGISTER_DECODER(RA_144, ra_144); REGISTER_DECODER(RA_288, ra_288); diff -r 36051a4c182a -r 6406b4e280d6 avcodec.h --- a/avcodec.h Fri May 04 00:09:33 2007 +0000 +++ b/avcodec.h Fri May 04 00:18:54 2007 +0000 @@ -2435,10 +2435,10 @@ extern AVCodec libgsm_ms_decoder; extern AVCodec libgsm_ms_encoder; extern AVCodec libtheora_encoder; +extern AVCodec libvorbis_decoder; +extern AVCodec libvorbis_encoder; extern AVCodec mp3lame_encoder; extern AVCodec mpeg4aac_decoder; -extern AVCodec oggvorbis_decoder; -extern AVCodec oggvorbis_encoder; extern AVCodec x264_encoder; extern AVCodec xvid_encoder; extern AVCodec zlib_decoder; diff -r 36051a4c182a -r 6406b4e280d6 oggvorbis.c --- a/oggvorbis.c Fri May 04 00:09:33 2007 +0000 +++ b/oggvorbis.c Fri May 04 00:18:54 2007 +0000 @@ -370,8 +370,8 @@ } -AVCodec oggvorbis_decoder = { - "vorbis", +AVCodec libvorbis_decoder = { + "libvorbis", CODEC_TYPE_AUDIO, CODEC_ID_VORBIS, sizeof(OggVorbisContext),