mirror of
				https://git.ffmpeg.org/ffmpeg.git
				synced 2025-10-31 15:50:55 +00:00 
			
		
		
		
	The MPEG4AAC codec is provided by an external library and will be disabled
with the next libavcodec major version bump. Originally committed as revision 13186 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									9f4aa35359
								
							
						
					
					
						commit
						8f89843475
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		|  | @ -195,7 +195,6 @@ void avcodec_register_all(void) | ||||||
|     REGISTER_DECODER (MP3ON4, mp3on4); |     REGISTER_DECODER (MP3ON4, mp3on4); | ||||||
|     REGISTER_DECODER (MPC7, mpc7); |     REGISTER_DECODER (MPC7, mpc7); | ||||||
|     REGISTER_DECODER (MPC8, mpc8); |     REGISTER_DECODER (MPC8, mpc8); | ||||||
|     REGISTER_DECODER (MPEG4AAC, mpeg4aac); |  | ||||||
|     REGISTER_DECODER (NELLYMOSER, nellymoser); |     REGISTER_DECODER (NELLYMOSER, nellymoser); | ||||||
|     REGISTER_DECODER (QDM2, qdm2); |     REGISTER_DECODER (QDM2, qdm2); | ||||||
|     REGISTER_DECODER (RA_144, ra_144); |     REGISTER_DECODER (RA_144, ra_144); | ||||||
|  | @ -288,6 +287,9 @@ void avcodec_register_all(void) | ||||||
|     REGISTER_ENCODER (LIBVORBIS, libvorbis); |     REGISTER_ENCODER (LIBVORBIS, libvorbis); | ||||||
|     REGISTER_ENCODER (LIBX264, libx264); |     REGISTER_ENCODER (LIBX264, libx264); | ||||||
|     REGISTER_ENCODER (LIBXVID, libxvid); |     REGISTER_ENCODER (LIBXVID, libxvid); | ||||||
|  | #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) | ||||||
|  |     REGISTER_DECODER (MPEG4AAC, mpeg4aac); | ||||||
|  | #endif | ||||||
| 
 | 
 | ||||||
|     /* parsers */ |     /* parsers */ | ||||||
|     REGISTER_PARSER  (AAC, aac); |     REGISTER_PARSER  (AAC, aac); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Diego Biurrun
						Diego Biurrun