[Ffmpeg-cvslog] CVS: ffmpeg ffmpeg.c,1.370,1.371

[Luca Abeni CVS]

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

Modified Files:
	ffmpeg.c 
Log Message:
Fix crop & pad + rescaling


Index: ffmpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/ffmpeg.c,v
retrieving revision 1.370
retrieving revision 1.371
diff -u -d -r1.370 -r1.371
--- ffmpeg.c	28 Feb 2006 11:32:31 -0000	1.370
+++ ffmpeg.c	9 Mar 2006 15:27:22 -0000	1.371
@@ -1729,8 +1729,8 @@
                 } else if ((codec->width == icodec->width -
                                 (frame_leftBand + frame_rightBand)) &&
                         (codec->height == icodec->height -
-                                (frame_topBand  + frame_bottomBand)))
-                {
+                                (frame_topBand  + frame_bottomBand)) &&
+                                (frame_rightBand + frame_leftBand + frame_topBand + frame_bottomBand)) {
                     ost->video_resample = 0;
                     ost->video_crop = 1;
                     ost->topBand = frame_topBand;
@@ -1738,7 +1738,8 @@
                 } else if ((codec->width == icodec->width +
                                 (frame_padleft + frame_padright)) &&
                         (codec->height == icodec->height +
-                                (frame_padtop + frame_padbottom))) {
+                                (frame_padtop + frame_padbottom)) &&
+                                (frame_padright + frame_padleft + frame_padtop + frame_padbottom)) {
                     ost->video_resample = 0;
                     ost->video_crop = 0;
                     ost->video_pad = 1;