Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'
* commit '1546a41adae818b340acdd9b5dacd6d0a92b6507': pixdesc: Drop unneeded deprecation warning guards Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
		
						commit
						3f462fcf76
					
				@ -2061,7 +2061,6 @@ static const char *chroma_location_names[AVCHROMA_LOC_NB] = {
 | 
			
		||||
    "top", "bottomleft", "bottom",
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
FF_DISABLE_DEPRECATION_WARNINGS
 | 
			
		||||
static enum AVPixelFormat get_pix_fmt_internal(const char *name)
 | 
			
		||||
{
 | 
			
		||||
    enum AVPixelFormat pix_fmt;
 | 
			
		||||
@ -2249,7 +2248,6 @@ void ff_check_pixfmt_descriptors(void){
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
FF_ENABLE_DEPRECATION_WARNINGS
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user