RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crop & pad + rescaling 

Originally committed as revision 5133 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2006-03-09 15:27:22 +00:00
parent bbdd41f57f
commit 4c4a4e9afe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg.c
View File

@ -1729,8 +1729,8 @@ static int av_encode(AVFormatContext **output_files,
} else if ((codec->width == icodec->width - } else if ((codec->width == icodec->width -
(frame_leftBand + frame_rightBand)) && (frame_leftBand + frame_rightBand)) &&
(codec->height == icodec->height - (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_resample = 0;
ost->video_crop = 1; ost->video_crop = 1;
ost->topBand = frame_topBand; ost->topBand = frame_topBand;
@ -1738,7 +1738,8 @@ static int av_encode(AVFormatContext **output_files,
} else if ((codec->width == icodec->width + } else if ((codec->width == icodec->width +
(frame_padleft + frame_padright)) && (frame_padleft + frame_padright)) &&
(codec->height == icodec->height + (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_resample = 0;
ost->video_crop = 0; ost->video_crop = 0;
ost->video_pad = 1; ost->video_pad = 1;