# HG changeset patch # User bcoudurier # Date 1242335152 0 # Node ID 14cb663f11c3026d440c3acc0dcafd82fee9e4cc # Parent c541d5552e207a946655eacb620e82cc8dc854c1 use flags field and remove key_frame field diff -r c541d5552e20 -r 14cb663f11c3 movenc.c --- a/movenc.c Thu May 14 20:54:19 2009 +0000 +++ b/movenc.c Thu May 14 21:05:52 2009 +0000 @@ -44,13 +44,14 @@ #define MODE_IPOD 0x20 typedef struct MOVIentry { - unsigned int flags, size; + unsigned int size; uint64_t pos; unsigned int samplesInChunk; - char key_frame; unsigned int entries; int cts; int64_t dts; +#define MOV_SYNC_SAMPLE 0x0001 + uint32_t flags; } MOVIentry; typedef struct MOVIndex { @@ -198,7 +199,7 @@ entryPos = url_ftell(pb); put_be32(pb, track->entry); // entry count for (i=0; ientry; i++) { - if(track->cluster[i].key_frame == 1) { + if (track->cluster[i].flags & MOV_SYNC_SAMPLE) { put_be32(pb, i+1); index++; } @@ -1877,9 +1878,10 @@ if (pkt->dts != pkt->pts) trk->hasBframes = 1; trk->cluster[trk->entry].cts = pkt->pts - pkt->dts; - trk->cluster[trk->entry].key_frame = !!(pkt->flags & PKT_FLAG_KEY); - if(trk->cluster[trk->entry].key_frame) + if (pkt->flags & PKT_FLAG_KEY) { + trk->cluster[trk->entry].flags = MOV_SYNC_SAMPLE; trk->hasKeyframes++; + } trk->entry++; trk->sampleCount += samplesInChunk; mov->mdat_size += size;