generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

movenc: Keep writing zero-entry stts atoms as intended

Browse Source 
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:
Martin Storsjö 2015-03-06 12:27:14 +02:00
parent 5aef535a64
commit 9731cf4001
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@ -1197,7 +1197,7 @@ static int mov_write_ctts_tag(AVIOContext *pb, MOVTrack *track)
/* Time to sample atom */ /* Time to sample atom */
static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)
{ {
MOVStts *stts_entries; MOVStts *stts_entries = NULL;
uint32_t entries = -1; uint32_t entries = -1;
uint32_t atom_size; uint32_t atom_size;
int i; int i;
@ -1210,11 +1210,11 @@ static int mov_write_stts_tag(AVIOContext *pb, MOVTrack *track)
stts_entries[0].duration = 1; stts_entries[0].duration = 1;
entries = 1; entries = 1;
} else { } else {
stts_entries = track->entry ? if (track->entry) {
av_malloc(track->entry * sizeof(*stts_entries)) : /* worst case */ stts_entries = av_malloc(track->entry * sizeof(*stts_entries)); /* worst case */
NULL;
if (!stts_entries) if (!stts_entries)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
for (i = 0; i < track->entry; i++) { for (i = 0; i < track->entry; i++) {
int duration = get_cluster_duration(track, i); int duration = get_cluster_duration(track, i);
if (i && duration == stts_entries[entries].duration) { if (i && duration == stts_entries[entries].duration) {