# HG changeset patch
# User rtogni
# Date 1195425602 0
# Node ID 137eec75e3dfd65675c3cf3159087b6f8d2dc9f1
# Parent  5e808c3a55a81379cab1e451f2b94c625d47ee75
Optimize memory management to create an av_packet from multiple slices:
- remove memmove to pack the data, instead copy only the used areas
from the temp buffer in their final position
- use the minimum possible size for the av_packet (relevant when some
slices are missing)

diff -r 5e808c3a55a8 -r 137eec75e3df rmdec.c
--- a/rmdec.c	Sat Nov 17 03:14:43 2007 +0000
+++ b/rmdec.c	Sun Nov 18 22:40:02 2007 +0000
@@ -519,14 +519,11 @@
     rm->remaining_len-= len;
 
     if(type == 2 || (rm->videobufpos) == rm->videobufsize){
-         //adjust slice headers
-         memmove(rm->videobuf + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufsize - 1 - 8*rm->slices);
-         ssize = rm->videobufsize - 8*(rm->slices - rm->cur_slice);
-
          rm->videobuf[0] = rm->cur_slice-1;
-         if(av_new_packet(pkt, ssize) < 0)
+         if(av_new_packet(pkt, rm->videobufpos - 8*(rm->slices - rm->cur_slice)) < 0)
              return AVERROR(ENOMEM);
-         memcpy(pkt->data, rm->videobuf, ssize);
+         memcpy(pkt->data, rm->videobuf, 1 + 8*rm->cur_slice);
+         memcpy(pkt->data + 1 + 8*rm->cur_slice, rm->videobuf + 1 + 8*rm->slices, rm->videobufpos - 1 - 8*rm->slices);
          pkt->pts = AV_NOPTS_VALUE;
          pkt->pos = rm->pktpos;
          return 0;