Commit accea4d9 authored by Yusuke Nakamura's avatar Yusuke Nakamura Committed by Martin Storsjö

mov: Fix detecting there is no sync sample.

Stss atom without entries doesn't mean every sample is a sync sample.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent f346b6bb
......@@ -106,6 +106,7 @@ typedef struct MOVStreamContext {
unsigned int sample_size;
unsigned int sample_count;
int *sample_sizes;
int keyframe_absent;
unsigned int keyframe_count;
int *keyframes;
int time_scale;
......
......@@ -1534,7 +1534,10 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom)
av_dlog(c->fc, "keyframe_count = %d\n", entries);
if (!entries)
{
sc->keyframe_absent = 1;
return 0;
}
if (entries >= UINT_MAX / sizeof(int))
return AVERROR_INVALIDDATA;
sc->keyframes = av_malloc(entries * sizeof(int));
......@@ -1776,7 +1779,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
return;
}
if (!sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index]) {
if (!sc->keyframe_absent && (!sc->keyframe_count || current_sample+key_off == sc->keyframes[stss_index])) {
keyframe = 1;
if (stss_index + 1 < sc->keyframe_count)
stss_index++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment