mirror of
				https://git.ffmpeg.org/ffmpeg.git
				synced 2025-10-30 23:30:55 +00:00 
			
		
		
		
	Rename oggvorbis decoder to libvorbis.
Originally committed as revision 8883 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									5982ae94ee
								
							
						
					
					
						commit
						b0caf888d2
					
				
					 4 changed files with 8 additions and 8 deletions
				
			
		
							
								
								
									
										4
									
								
								configure
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								configure
									
										
									
									
										vendored
									
									
								
							|  | @ -696,8 +696,8 @@ libgsm_ms_decoder_deps="libgsm" | ||||||
| libgsm_ms_encoder_deps="libgsm" | libgsm_ms_encoder_deps="libgsm" | ||||||
| libtheora_encoder_deps="libtheora" | libtheora_encoder_deps="libtheora" | ||||||
| mp3lame_encoder_deps="libmp3lame" | mp3lame_encoder_deps="libmp3lame" | ||||||
| oggvorbis_decoder_deps="libvorbis" | libvorbis_decoder_deps="libvorbis" | ||||||
| oggvorbis_encoder_deps="libvorbis" | libvorbis_encoder_deps="libvorbis" | ||||||
| 
 | 
 | ||||||
| ac3_demuxer_deps="ac3_parser" | ac3_demuxer_deps="ac3_parser" | ||||||
| audio_demuxer_deps_any="audio_oss audio_beos" | audio_demuxer_deps_any="audio_oss audio_beos" | ||||||
|  |  | ||||||
|  | @ -179,6 +179,8 @@ void avcodec_register_all(void) | ||||||
|     REGISTER_ENCDEC (LIBGSM, libgsm); |     REGISTER_ENCDEC (LIBGSM, libgsm); | ||||||
|     REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); |     REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms); | ||||||
|     REGISTER_ENCODER(LIBTHEORA, libtheora); |     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(MACE3, mace3); | ||||||
|     REGISTER_DECODER(MACE6, mace6); |     REGISTER_DECODER(MACE6, mace6); | ||||||
|     REGISTER_ENCDEC (MP2, mp2); |     REGISTER_ENCDEC (MP2, mp2); | ||||||
|  | @ -187,8 +189,6 @@ void avcodec_register_all(void) | ||||||
|     REGISTER_ENCODER(MP3LAME, mp3lame); |     REGISTER_ENCODER(MP3LAME, mp3lame); | ||||||
|     REGISTER_DECODER(MP3ON4, mp3on4); |     REGISTER_DECODER(MP3ON4, mp3on4); | ||||||
|     REGISTER_DECODER(MPC7, mpc7); |     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(QDM2, qdm2); | ||||||
|     REGISTER_DECODER(RA_144, ra_144); |     REGISTER_DECODER(RA_144, ra_144); | ||||||
|     REGISTER_DECODER(RA_288, ra_288); |     REGISTER_DECODER(RA_288, ra_288); | ||||||
|  |  | ||||||
|  | @ -2435,10 +2435,10 @@ extern AVCodec libgsm_encoder; | ||||||
| extern AVCodec libgsm_ms_decoder; | extern AVCodec libgsm_ms_decoder; | ||||||
| extern AVCodec libgsm_ms_encoder; | extern AVCodec libgsm_ms_encoder; | ||||||
| extern AVCodec libtheora_encoder; | extern AVCodec libtheora_encoder; | ||||||
|  | extern AVCodec libvorbis_decoder; | ||||||
|  | extern AVCodec libvorbis_encoder; | ||||||
| extern AVCodec mp3lame_encoder; | extern AVCodec mp3lame_encoder; | ||||||
| extern AVCodec mpeg4aac_decoder; | extern AVCodec mpeg4aac_decoder; | ||||||
| extern AVCodec oggvorbis_decoder; |  | ||||||
| extern AVCodec oggvorbis_encoder; |  | ||||||
| extern AVCodec x264_encoder; | extern AVCodec x264_encoder; | ||||||
| extern AVCodec xvid_encoder; | extern AVCodec xvid_encoder; | ||||||
| extern AVCodec zlib_decoder; | extern AVCodec zlib_decoder; | ||||||
|  |  | ||||||
|  | @ -370,8 +370,8 @@ static int oggvorbis_decode_close(AVCodecContext *avccontext) { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| AVCodec oggvorbis_decoder = { | AVCodec libvorbis_decoder = { | ||||||
|     "vorbis", |     "libvorbis", | ||||||
|     CODEC_TYPE_AUDIO, |     CODEC_TYPE_AUDIO, | ||||||
|     CODEC_ID_VORBIS, |     CODEC_ID_VORBIS, | ||||||
|     sizeof(OggVorbisContext), |     sizeof(OggVorbisContext), | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Diego Biurrun
						Diego Biurrun