Commit fce2200d authored by Steven Johnson's avatar Steven Johnson Committed by Alex Beregszaszi
Browse files

Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson

Originally committed as revision 7165 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 37e6f5f3
...@@ -246,9 +246,15 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, ...@@ -246,9 +246,15 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
while (compressed_lines > 0) { while (compressed_lines > 0) {
line_packets = LE_16(&buf[stream_ptr]); line_packets = LE_16(&buf[stream_ptr]);
stream_ptr += 2; stream_ptr += 2;
if (line_packets < 0) { if ((line_packets & 0xC000) == 0xC000) {
// line skip opcode
line_packets = -line_packets; line_packets = -line_packets;
y_ptr += line_packets * s->frame.linesize[0]; y_ptr += line_packets * s->frame.linesize[0];
} else if ((line_packets & 0xC000) == 0x4000) {
av_log(avctx, AV_LOG_ERROR, "Undefined opcode (%x) in DELTA_FLI\n", line_packets);
} else if ((line_packets & 0xC000) == 0x8000) {
// "last byte" opcode
pixels[y_ptr + s->frame.linesize[0] - 1] = line_packets & 0xff;
} else { } else {
compressed_lines--; compressed_lines--;
pixel_ptr = y_ptr; pixel_ptr = y_ptr;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment