Commit a7fa1b9a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '443b7192'

* commit '443b7192':
  hevc: unref the current frame if frame_start() fails

Conflicts:
	libavcodec/hevc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 74e5a5a8 443b7192
...@@ -2591,8 +2591,8 @@ static int hevc_frame_start(HEVCContext *s) ...@@ -2591,8 +2591,8 @@ static int hevc_frame_start(HEVCContext *s)
return 0; return 0;
fail: fail:
if (s->ref && s->threads_type == FF_THREAD_FRAME) if (s->ref)
ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); ff_hevc_unref_frame(s, s->ref, ~0);
s->ref = NULL; s->ref = NULL;
return ret; return ret;
} }
......
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