mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
Make MS RLE decoder produce both bottom-up and top-down pictures
Originally committed as revision 20111 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
535497f193
commit
b08de903cd
@ -167,7 +167,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
|
||||
continue;
|
||||
}
|
||||
// Copy data
|
||||
if (output + p2 * (depth >> 3) > output_end) {
|
||||
if ((pic->linesize[0] > 0 && output + p2 * (depth >> 3) > output_end)
|
||||
||(pic->linesize[0] < 0 && output + p2 * (depth >> 3) < output_end)) {
|
||||
src += p2 * (depth >> 3);
|
||||
continue;
|
||||
}
|
||||
@ -211,7 +212,8 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, int de
|
||||
src += 4;
|
||||
break;
|
||||
}
|
||||
if (output + p1 * (depth >> 3) > output_end)
|
||||
if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end)
|
||||
||(pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end))
|
||||
continue;
|
||||
for(i = 0; i < p1; i++) {
|
||||
switch(depth){
|
||||
|
Loading…
Reference in New Issue
Block a user