[FFmpeg-cvslog] swscale: fix mono input for width%8

Michael Niedermayer git at videolan.org
Sun Jun 19 03:58:28 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 19 03:33:15 2011 +0200| [15b4f6449ddb1f52ae82dee3f94a5b56b636cbea] | committer: Michael Niedermayer

swscale: fix mono input for width%8

Fixes ticket193

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15b4f6449ddb1f52ae82dee3f94a5b56b636cbea
---

 libswscale/swscale.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 4318e0b..abbe375 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1677,6 +1677,11 @@ static void monowhite2Y_c(int16_t *dst, const uint8_t *src, int width, uint32_t
         for(j=0; j<8; j++)
             dst[8*i+j]= ((d>>(7-j))&1)*16383;
     }
+    if(width&7){
+        int d= ~src[i];
+        for(j=0; j<(width&7); j++)
+            dst[8*i+j]= ((d>>(7-j))&1)*16383;
+    }
 }
 
 static void monoblack2Y_c(int16_t *dst, const uint8_t *src, int width, uint32_t *unused)
@@ -1687,6 +1692,11 @@ static void monoblack2Y_c(int16_t *dst, const uint8_t *src, int width, uint32_t
         for(j=0; j<8; j++)
             dst[8*i+j]= ((d>>(7-j))&1)*16383;
     }
+    if(width&7){
+        int d= src[i];
+        for(j=0; j<(width&7); j++)
+            dst[8*i+j]= ((d>>(7-j))&1)*16383;
+    }
 }
 
 //FIXME yuy2* can read up to 7 samples too much



More information about the ffmpeg-cvslog mailing list