RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2015-01-27 13:15:06 +01:00
parent 74e5a5a849 443b71928b
commit a7fa1b9aa1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/hevc.c
View File

@ -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;
} }