define MPEG4AAC id to AAC, and get rid of it and MP3LAME id with next major bump
Originally committed as revision 8166 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									eb3c8c0b31
								
							
						
					
					
						commit
						abd6a4fc53
					
				@ -249,8 +249,11 @@ enum CodecID {
 | 
				
			|||||||
                         stream (only used by libavformat) */
 | 
					                         stream (only used by libavformat) */
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
 | 
				
			||||||
/* CODEC_ID_MP3LAME is absolete */
 | 
					/* CODEC_ID_MP3LAME is absolete */
 | 
				
			||||||
#define CODEC_ID_MP3LAME CODEC_ID_MP3
 | 
					#define CODEC_ID_MP3LAME CODEC_ID_MP3
 | 
				
			||||||
 | 
					#define CODEC_ID_MPEG4AAC CODEC_ID_AAC
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
enum CodecType {
 | 
					enum CodecType {
 | 
				
			||||||
    CODEC_TYPE_UNKNOWN = -1,
 | 
					    CODEC_TYPE_UNKNOWN = -1,
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user