virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

movenc: Remove unneeded chunkSize field from MOVIentry

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Geek.Song 2011-11-29 16:50:25 +01:00 committed by Michael Niedermayer
parent 313d30c180
commit 9cdf048ad2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/movenc.c
View File

@ -1811,15 +1811,17 @@ static void build_chunks(MOVTrack *trk)
{ {
int i; int i;
MOVIentry *chunk= &trk->cluster[0]; MOVIentry *chunk= &trk->cluster[0];
uint64_t chunkSize = chunk->size;
chunk->chunkNum= 1; chunk->chunkNum= 1;
trk->chunkCount= 1; trk->chunkCount= 1;
for(i=1; i<trk->entry; i++){ for(i=1; i<trk->entry; i++){
if(chunk->pos + chunk->chunkSize == trk->cluster[i].pos){ if(chunk->pos + chunkSize == trk->cluster[i].pos){
chunk->chunkSize += trk->cluster[i].size; chunkSize += trk->cluster[i].size;
chunk->samplesInChunk += trk->cluster[i].entries; chunk->samplesInChunk += trk->cluster[i].entries;
}else{ }else{
trk->cluster[i].chunkNum = chunk->chunkNum+1; trk->cluster[i].chunkNum = chunk->chunkNum+1;
chunk=&trk->cluster[i]; chunk=&trk->cluster[i];
chunkSize = chunk->size;
trk->chunkCount++; trk->chunkCount++;
} }
} }
@ -2092,7 +2094,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
trk->cluster[trk->entry].pos = avio_tell(pb) - size; trk->cluster[trk->entry].pos = avio_tell(pb) - size;
trk->cluster[trk->entry].samplesInChunk = samplesInChunk; trk->cluster[trk->entry].samplesInChunk = samplesInChunk;
trk->cluster[trk->entry].chunkSize =
trk->cluster[trk->entry].size = size; trk->cluster[trk->entry].size = size;
trk->cluster[trk->entry].entries = samplesInChunk; trk->cluster[trk->entry].entries = samplesInChunk;
trk->cluster[trk->entry].dts = pkt->dts; trk->cluster[trk->entry].dts = pkt->dts;

1
libavformat/movenc.h
View File

@ -44,7 +44,6 @@ typedef struct MOVIentry {
uint64_t pos; uint64_t pos;
unsigned int samplesInChunk; unsigned int samplesInChunk;
unsigned int chunkNum; ///< Chunk number if the current entry is a chunk start otherwise 0 unsigned int chunkNum; ///< Chunk number if the current entry is a chunk start otherwise 0
uint64_t chunkSize;
unsigned int entries; unsigned int entries;
int cts; int cts;
int64_t dts; int64_t dts;