Browse Source

Merge commit 'ab1189766a82a95f108005463cde75f73fcc0ae5'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.0
Michael Niedermayer 12 years ago
parent
commit
28ce9c0b73
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      libavformat/movenc.c
  2. +1
    -1
      libavformat/movenc.h

+ 1
- 1
libavformat/movenc.c 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);


+ 1
- 1
libavformat/movenc.h 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


Loading…
Cancel
Save