Commit f63f689e authored by Reimar Döffinger's avatar Reimar Döffinger

Avoid code duplication in xan_unpack for the final memcpy.

Originally committed as revision 18608 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7b7b19b6
...@@ -157,17 +157,18 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l ...@@ -157,17 +157,18 @@ static void xan_unpack(unsigned char *dest, const unsigned char *src, int dest_l
av_memcpy_backptr(dest, back, size2); av_memcpy_backptr(dest, back, size2);
dest += size2; dest += size2;
} else { } else {
int finish;
size = ((opcode & 0x1f) << 2) + 4; size = ((opcode & 0x1f) << 2) + 4;
if (size > 0x70) finish = size > 0x70;
break; if (finish)
size = opcode & 3;
memcpy(dest, src, size); dest += size; src += size; memcpy(dest, src, size); dest += size; src += size;
if (finish)
return;
} }
} }
size = opcode & 3;
memcpy(dest, src, size); dest += size; src += size;
} }
static inline void xan_wc3_output_pixel_run(XanContext *s, static inline void xan_wc3_output_pixel_run(XanContext *s,
......
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