highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '60198742ff851f11a3757c713fc75a9c19b88566'

Browse Source 
* commit '60198742ff851f11a3757c713fc75a9c19b88566':
  movenc: fix detection of 64bit offset requirement

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-22 14:16:52 +02:00
commit 25e4ec6aa1
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/movenc.c
View File

@ -93,16 +93,10 @@ static int supports_edts(MOVMuxContext *mov)
return (mov->use_editlist<0 && !(mov->flags & FF_MOV_FLAG_FRAGMENT)) || mov->use_editlist>0;
}
static int is_co64_required(const MOVTrack *track)
static int co64_required(const MOVTrack *track)
{
int i;
for (i = 0; i < track->entry; i++) {
if (!track->cluster[i].chunkNum)
continue;
if (track->cluster[i].pos + track->data_offset > UINT32_MAX)
return 1;
}
if (track->entry > 0 && track->cluster[track->entry - 1].pos + track->data_offset > UINT32_MAX)
return 1;
return 0;
}
@ -110,7 +104,7 @@ static int is_co64_required(const MOVTrack *track)
static int mov_write_stco_tag(AVIOContext *pb, MOVTrack *track)
{
int i;
int mode64 = is_co64_required(track); // use 32 bit size variant if possible
int mode64 = co64_required(track); // use 32 bit size variant if possible
int64_t pos = avio_tell(pb);
avio_wb32(pb, 0); /* size */
if (mode64)