Fix blend_subrect for even-width subrects positioned on odd columns
Patch by Björn Axelsson ( gecko A acc D umu D se ) Originally committed as revision 17088 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
				
					committed by
					
						
						Robert Swain
					
				
			
			
				
	
			
			
			
						parent
						
							ffe2c09d46
						
					
				
				
					commit
					f54b31b9ef
				
			
							
								
								
									
										2
									
								
								ffplay.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								ffplay.c
									
									
									
									
									
								
							@@ -449,7 +449,7 @@ static void blend_subrect(AVPicture *dst, const AVSubtitleRect *rect, int imgw,
 | 
				
			|||||||
    cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 | 
					    cb = dst->data[1] + (dsty >> 1) * dst->linesize[1];
 | 
				
			||||||
    cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 | 
					    cr = dst->data[2] + (dsty >> 1) * dst->linesize[2];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    width2 = (dstw + 1) >> 1;
 | 
					    width2 = ((dstw + 1) >> 1) + (dstx & ~dstw & 1);
 | 
				
			||||||
    skip2 = dstx >> 1;
 | 
					    skip2 = dstx >> 1;
 | 
				
			||||||
    wrap = dst->linesize[0];
 | 
					    wrap = dst->linesize[0];
 | 
				
			||||||
    wrap3 = rect->pict.linesize[0];
 | 
					    wrap3 = rect->pict.linesize[0];
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user