Merge commit '74942685cb457c01937686892878403a409baf27'

[ffmpeg] / libavcodec / hevc_refs.c

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index e85ce89086017febd6005bea767a83b23010ce3a..611ad458defc41816d7132c3e2f3a53ee7bb7dfa 100644 (file)
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -174,7 +174,7 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
         int min_poc   = INT_MAX;
         int i, min_idx, ret;
 
-        if (s->sh.no_output_of_prior_pics_flag == 1) {
+        if (s->sh.no_output_of_prior_pics_flag == 1 && s->no_rasl_output_flag == 1) {
             for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) {
                 HEVCFrame *frame = &s->DPB[i];
                 if (!(frame->flags & HEVC_FRAME_FLAG_BUMPING) && frame->poc != s->poc &&