Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5'

* commit 'ab1189766a82a95f108005463cde75f73fcc0ae5':
  movenc: Increase the cluster array allocation by doubling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-05 11:26:26 +02:00
commit 28ce9c0b73
2 changed files with 2 additions and 2 deletions

View File

@ -3209,7 +3209,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
}
if (trk->entry >= trk->cluster_capacity) {
unsigned new_capacity = trk->entry + MOV_INDEX_CLUSTER_SIZE;
unsigned new_capacity = 2*(trk->entry + MOV_INDEX_CLUSTER_SIZE);
if (av_reallocp_array(&trk->cluster, new_capacity,
sizeof(*trk->cluster)))
return AVERROR(ENOMEM);

View File

@ -26,7 +26,7 @@
#include "avformat.h"
#define MOV_INDEX_CLUSTER_SIZE 16384
#define MOV_INDEX_CLUSTER_SIZE 1024
#define MOV_TIMESCALE 1000
#define RTP_MAX_PACKET_SIZE 1450