movenc: Keep writing zero-entry stts atoms as intended
a876585215 had the unintended side effect of returning AVERROR(ENOMEM) when track->entry is zero, while the code intentionally wants to continue in that case. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
5aef535a64
commit
9731cf4001
@ -1197,7 +1197,7 @@ static int mov_write_ctts_tag(AVIOContext *pb, MOVTrack *track)
|
||||
/* Time to sample atom */
|
||||
static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)
|
||||
{
|
||||
MOVStts *stts_entries;
|
||||
MOVStts *stts_entries = NULL;
|
||||
uint32_t entries = -1;
|
||||
uint32_t atom_size;
|
||||
int i;
|
||||
@ -1210,11 +1210,11 @@ static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)
|
||||
stts_entries[0].duration = 1;
|
||||
entries = 1;
|
||||
} else {
|
||||
stts_entries = track->entry ?
|
||||
av_malloc(track->entry * sizeof(*stts_entries)) : /* worst case */
|
||||
NULL;
|
||||
if (!stts_entries)
|
||||
return AVERROR(ENOMEM);
|
||||
if (track->entry) {
|
||||
stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */
|
||||
if (!stts_entries)
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
for (i = 0; i < track->entry; i++) {
|
||||
int duration = get_cluster_duration(track, i);
|
||||
if (i && duration == stts_entries[entries].duration) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user