aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-09-03 12:15:24 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-09-28 17:11:52 +0200
commitcb8a29f872909aa88f34b1b9b8e4a355af889ee6 (patch)
tree38815df2d536e60386a83e451c63eb3192eafa56
parent6744d3f6b953884fd092bd6fc460513e7531defe (diff)
downloadffmpeg-cb8a29f872909aa88f34b1b9b8e4a355af889ee6.tar.gz
swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit e57d99dd4e0d8fe2992da0d65b563580e35ce728) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libswscale/swscale_unscaled.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 9662a10ab4..b2d1401e6f 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -558,6 +558,8 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
int bpc = dst_format->comp[0].depth;
int alpha = src_format->flags & AV_PIX_FMT_FLAG_ALPHA;
int swap = 0;
+ int i;
+
if ( HAVE_BIGENDIAN && !(src_format->flags & AV_PIX_FMT_FLAG_BE) ||
!HAVE_BIGENDIAN && src_format->flags & AV_PIX_FMT_FLAG_BE)
swap++;
@@ -571,6 +573,12 @@ static int Rgb16ToPlanarRgb16Wrapper(SwsContext *c, const uint8_t *src[],
src_format->name, dst_format->name);
return srcSliceH;
}
+
+ for(i=0; i<4; i++) {
+ dst2013[i] += stride2013[i] * srcSliceY / 2;
+ dst1023[i] += stride1023[i] * srcSliceY / 2;
+ }
+
switch (c->srcFormat) {
case AV_PIX_FMT_RGB48LE:
case AV_PIX_FMT_RGB48BE: