summaryrefslogtreecommitdiff
path: root/libswscale/output.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2012-04-04 10:50:29 -0700
committerRonald S. Bultje <rsbultje@gmail.com>2012-04-04 10:55:50 -0700
commitbc0bdda77b8df4c963dde55793dcecb65232c21a (patch)
treedae7c492a57b45cb896719b0106fee162d19b0ac /libswscale/output.c
parente484265c9712dd108c61f21bbc7644a2b791f36f (diff)
swscale: handle complete dimensions for monoblack/white.
Fixes bug 269.
Diffstat (limited to 'libswscale/output.c')
-rw-r--r--libswscale/output.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/libswscale/output.c b/libswscale/output.c
index 533fcd945d..f1acf9ec92 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -317,7 +317,7 @@ yuv2mono_X_c_template(SwsContext *c, const int16_t *lumFilter,
int i;
unsigned acc = 0;
- for (i = 0; i < dstW - 1; i += 2) {
+ for (i = 0; i < dstW; i += 2) {
int j;
int Y1 = 1 << 18;
int Y2 = 1 << 18;
@@ -338,6 +338,10 @@ yuv2mono_X_c_template(SwsContext *c, const int16_t *lumFilter,
output_pixel(*dest++, acc);
}
}
+
+ if (i & 6) {
+ output_pixel(*dest, acc);
+ }
}
static av_always_inline void
@@ -352,7 +356,7 @@ yuv2mono_2_c_template(SwsContext *c, const int16_t *buf[2],
int yalpha1 = 4095 - yalpha;
int i;
- for (i = 0; i < dstW - 7; i += 8) {
+ for (i = 0; i < dstW; i += 8) {
int Y, acc = 0;
Y = (buf0[i + 0] * yalpha1 + buf1[i + 0] * yalpha) >> 19;
@@ -385,7 +389,7 @@ yuv2mono_1_c_template(SwsContext *c, const int16_t *buf0,
const uint8_t * const d128 = dither_8x8_220[y & 7];
int i;
- for (i = 0; i < dstW - 7; i += 8) {
+ for (i = 0; i < dstW; i += 8) {
int acc = 0;
accumulate_bit(acc, (buf0[i + 0] >> 7) + d128[0]);