aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-08 22:48:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-11 21:27:21 +0100
commitba6e36f906c9ff8a4debd44288792579495bafc3 (patch)
treea8d04fea459dd5e7a6c94bb9d3bada32208b5144
parent84d0fcf268da880211b8e3f72764e2a47e07955b (diff)
downloadffmpeg-ba6e36f906c9ff8a4debd44288792579495bafc3.tar.gz
swscale: Force full horizontal chroma internally when the output has a odd size.
This fixes a gray line on the right side due to 1 column of pixels being skiped. Fixes Ticket891 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libswscale/utils.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 1bbe58e58b..13eb07512e 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -850,7 +850,14 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat);
// reuse chroma for 2 pixels RGB/BGR unless user wants full chroma interpolation
- if (isAnyRGB(dstFormat) && !(flags&SWS_FULL_CHR_H_INT)) c->chrDstHSubSample=1;
+ if (isAnyRGB(dstFormat) && !(flags&SWS_FULL_CHR_H_INT)) {
+ if (dstW&1) {
+ av_log(c, AV_LOG_DEBUG, "Forcing full internal H chroma due to odd output size\n");
+ flags |= SWS_FULL_CHR_H_INT;
+ c->flags = flags;
+ } else
+ c->chrDstHSubSample = 1;
+ }
// drop some chroma lines if the user wants it
c->vChrDrop= (flags&SWS_SRC_V_CHR_DROP_MASK)>>SWS_SRC_V_CHR_DROP_SHIFT;