diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/allcodecs.c | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 4 | ||||
| -rw-r--r-- | libavcodec/oggvorbis.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 5b1c6ccc36..28820654e1 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -179,6 +179,8 @@ void avcodec_register_all(void) 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 @@ void avcodec_register_all(void) 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 --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9d6d04ab8a..ae47abdd2e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2435,10 +2435,10 @@ extern AVCodec libgsm_encoder; 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 --git a/libavcodec/oggvorbis.c b/libavcodec/oggvorbis.c index da97e9a78e..3800902183 100644 --- a/libavcodec/oggvorbis.c +++ b/libavcodec/oggvorbis.c @@ -370,8 +370,8 @@ static int oggvorbis_decode_close(AVCodecContext *avccontext) { } -AVCodec oggvorbis_decoder = { - "vorbis", +AVCodec libvorbis_decoder = { + "libvorbis", CODEC_TYPE_AUDIO, CODEC_ID_VORBIS, sizeof(OggVorbisContext), |