diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5ea99e1924..1649f712fa 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7968,6 +7968,7 @@ static int decode_frame(AVCodecContext *avctx,
         return -1;
 
     if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
+        if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
         av_log(avctx, AV_LOG_ERROR, "no frame!\n");
         return -1;
     }