[Ffmpeg-cvslog] r7165 - trunk/libavcodec/flicvideo.c

[alex]

Author: alex
Date: Fri Nov 24 01:16:32 2006
New Revision: 7165

Modified:
   trunk/libavcodec/flicvideo.c

Log:
Implement DELTA_FLI opcodes correctly. Patch by Steven Johnson

Modified: trunk/libavcodec/flicvideo.c
==============================================================================
--- trunk/libavcodec/flicvideo.c	(original)
+++ trunk/libavcodec/flicvideo.c	Fri Nov 24 01:16:32 2006
@@ -246,9 +246,15 @@
             while (compressed_lines > 0) {
                 line_packets = LE_16(&buf[stream_ptr]);
                 stream_ptr += 2;
-                if (line_packets < 0) {
+                if ((line_packets & 0xC000) == 0xC000) {
+                    // line skip opcode
                     line_packets = -line_packets;
                     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 {
                     compressed_lines--;
                     pixel_ptr = y_ptr;