diff --git a/libavformat/isom.h b/libavformat/isom.h
index 214af589a546bb63d60ec409d249ff9de4562648..f716d9323feac4edead5b9ec849fc5ff44aa09ad 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -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;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1492486dcc863de1e27ca3cdd6639397b5d06a1d..046c030bcfd0a20086e7f7b54609baf653c91f0e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -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++;