aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sunrastenc.c
diff options
context:
space:
mode:
authorAneesh Dogra <lionaneesh@gmail.com>2012-03-23 23:24:00 +0530
committerJustin Ruggles <justin.ruggles@gmail.com>2012-03-24 11:27:20 -0400
commitcc965300cb504ce452df1d37041b81c6ee6a5964 (patch)
treef614ac8bc29c987f27f27d489256f6736e6bc9fa /libavcodec/sunrastenc.c
parent14ba7472dca38323104d05a3eacd0eb2890b00c6 (diff)
downloadffmpeg-cc965300cb504ce452df1d37041b81c6ee6a5964.tar.gz
sunrast: Add support for negative linesize.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavcodec/sunrastenc.c')
-rw-r--r--libavcodec/sunrastenc.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/sunrastenc.c b/libavcodec/sunrastenc.c
index a9b4749758..1ed1d6eddb 100644
--- a/libavcodec/sunrastenc.c
+++ b/libavcodec/sunrastenc.c
@@ -83,15 +83,18 @@ static void sunrast_image_write_image(AVCodecContext *avctx,
if (s->type == RT_BYTE_ENCODED) {
uint8_t value, value2;
int run;
- const uint8_t *end = pixels + avctx->height * linesize;
+ const uint8_t *start = linesize < 0 ? pixels + (avctx->height - 1) * linesize
+ : pixels;
+ const uint8_t *end = linesize < 0 ? pixels - linesize
+ : pixels + avctx->height * linesize;
ptr = pixels;
-#define GET_VALUE ptr >= end ? 0 : x >= len ? ptr[len-1] : ptr[x]
+#define GET_VALUE ptr >= end || ptr < start ? 0 : x >= len ? ptr[len-1] : ptr[x]
x = 0;
value2 = GET_VALUE;
- while (ptr < end) {
+ while (ptr < end && ptr >= start) {
run = 1;
value = value2;
x++;
@@ -101,7 +104,7 @@ static void sunrast_image_write_image(AVCodecContext *avctx,
}
value2 = GET_VALUE;
- while (value2 == value && run < 256 && ptr < end) {
+ while (value2 == value && run < 256 && ptr < end && ptr >= start) {
x++;
run++;
if (x >= alen) {