[SCM] libav/experimental: Fix crop & pad + rescaling
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:46:56 UTC 2013
The following commit has been merged in the experimental branch:
commit 4c4a4e9afefc98699f0c720f363e1ce66d8a745d
Author: Luca Abeni <lucabe72 at email.it>
Date: Thu Mar 9 15:27:22 2006 +0000
Fix crop & pad + rescaling
Originally committed as revision 5133 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffmpeg.c b/ffmpeg.c
index 84d0d5e..22a6b9d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1729,8 +1729,8 @@ static int av_encode(AVFormatContext **output_files,
} 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 @@ static int av_encode(AVFormatContext **output_files,
} 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list