aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc_refs.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-12 21:50:24 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-20 00:17:32 +0200
commit0118158efa8e45761f9f65a3bb74f33907bd2aec (patch)
treefc412dc6628e781dd9729b9359f2d133b90ffc9a /libavcodec/hevc_refs.c
parent11b563ed8f7c1a9183ba77680d9040fc384733d5 (diff)
downloadandroid_external_ffmpeg-0118158efa8e45761f9f65a3bb74f33907bd2aec.tar.gz
android_external_ffmpeg-0118158efa8e45761f9f65a3bb74f33907bd2aec.tar.bz2
android_external_ffmpeg-0118158efa8e45761f9f65a3bb74f33907bd2aec.zip
hevc: properly handle no_rasl_output_flag when removing pictures from the DPB
Fixes ticket #4185. Reviewed-By: Mickael Raulet <Mickael.Raulet@insa-rennes.fr> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/hevc_refs.c')
-rw-r--r--libavcodec/hevc_refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index e85ce89086..611ad458de 100644
--- 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 &&