[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.379,1.380

[Luca Abeni CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv9468

Modified Files:
	ffmpeg.c 
Log Message:
Fix cropping & padding when capturing from a v4l(2) card


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.379
retrieving revision 1.380
diff -u -d -r1.379 -r1.380
--- ffmpeg.c	20 Apr 2006 12:57:19 -0000	1.379
+++ ffmpeg.c	16 May 2006 13:43:06 -0000	1.380
@@ -3463,6 +3463,10 @@
 
                 if (vp->time_base.num*(int64_t)enc->time_base.den > enc->time_base.num*(int64_t)vp->time_base.den){
                     vp->time_base = enc->time_base;
+                    vp->width += frame_leftBand + frame_rightBand;
+                    vp->width -= (frame_padleft + frame_padright);
+                    vp->height += frame_topBand + frame_bottomBand;
+                    vp->height -= (frame_padtop + frame_padbottom);
                 }
                 has_video = 1;
                 break;