|  |  | @@ -799,17 +799,26 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], | 
		
	
		
			
			|  |  |  | uint8_t *src_data[4], int src_linesize[4], | 
		
	
		
			
			|  |  |  | enum PixelFormat pix_fmt, int width, int height) | 
		
	
		
			
			|  |  |  | { | 
		
	
		
			
			|  |  |  | int i; | 
		
	
		
			
			|  |  |  | const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; | 
		
	
		
			
			|  |  |  | const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt]; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | switch(pf->pixel_type) { | 
		
	
		
			
			|  |  |  | case FF_PIXEL_PACKED: | 
		
	
		
			
			|  |  |  | case FF_PIXEL_PLANAR: | 
		
	
		
			
			|  |  |  | for(i = 0; i < pf->nb_channels; i++) { | 
		
	
		
			
			|  |  |  | int h; | 
		
	
		
			
			|  |  |  | if (desc->flags & PIX_FMT_HWACCEL) | 
		
	
		
			
			|  |  |  | return; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | if (desc->flags & PIX_FMT_PAL) { | 
		
	
		
			
			|  |  |  | av_image_copy_plane(dst_data[0], dst_linesize[0], | 
		
	
		
			
			|  |  |  | src_data[0], src_linesize[0], | 
		
	
		
			
			|  |  |  | width, height); | 
		
	
		
			
			|  |  |  | /* copy the palette */ | 
		
	
		
			
			|  |  |  | memcpy(dst_data[1], src_data[1], 4*256); | 
		
	
		
			
			|  |  |  | } else { | 
		
	
		
			
			|  |  |  | int i, planes_nb = 0; | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | for (i = 0; i < desc->nb_components; i++) | 
		
	
		
			
			|  |  |  | planes_nb = FFMAX(planes_nb, desc->comp[i].plane + 1); | 
		
	
		
			
			|  |  |  | 
 | 
		
	
		
			
			|  |  |  | for (i = 0; i < planes_nb; i++) { | 
		
	
		
			
			|  |  |  | int h = height; | 
		
	
		
			
			|  |  |  | int bwidth = av_image_get_linesize(pix_fmt, width, i); | 
		
	
		
			
			|  |  |  | h = height; | 
		
	
		
			
			|  |  |  | if (i == 1 || i == 2) { | 
		
	
		
			
			|  |  |  | h= -((-height)>>desc->log2_chroma_h); | 
		
	
		
			
			|  |  |  | } | 
		
	
	
		
			
				|  |  | @@ -817,14 +826,6 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], | 
		
	
		
			
			|  |  |  | src_data[i], src_linesize[i], | 
		
	
		
			
			|  |  |  | bwidth, h); | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | break; | 
		
	
		
			
			|  |  |  | case FF_PIXEL_PALETTE: | 
		
	
		
			
			|  |  |  | av_image_copy_plane(dst_data[0], dst_linesize[0], | 
		
	
		
			
			|  |  |  | src_data[0], src_linesize[0], | 
		
	
		
			
			|  |  |  | width, height); | 
		
	
		
			
			|  |  |  | /* copy the palette */ | 
		
	
		
			
			|  |  |  | memcpy(dst_data[1], src_data[1], 4*256); | 
		
	
		
			
			|  |  |  | break; | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | } | 
		
	
		
			
			|  |  |  | 
 | 
		
	
	
		
			
				|  |  | 
 |