diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:15:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 13:15:06 +0100 |
| commit | a7fa1b9aa104491e44a0489e09febe036c70f4f9 (patch) | |
| tree | 7b3bd98612d4deb3678fef9c58aca7e02bcd34ad | |
| parent | 74e5a5a849bc57df564eca4cf60e1da4148c2e83 (diff) | |
| parent | 443b71928b2f36362e805c037751e6c3c79ea4e8 (diff) | |
| download | ffmpeg-a7fa1b9aa104491e44a0489e09febe036c70f4f9.tar.gz | |
Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8'
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
hevc: unref the current frame if frame_start() fails
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 4fe20790fc..641f4c13d2 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2591,8 +2591,8 @@ static int hevc_frame_start(HEVCContext *s) return 0; fail: - if (s->ref && s->threads_type == FF_THREAD_FRAME) - ff_thread_report_progress(&s->ref->tf, INT_MAX, 0); + if (s->ref) + ff_hevc_unref_frame(s, s->ref, ~0); s->ref = NULL; return ret; } |