On Wed, Sep 30, 2015 at 04:38:40PM +0200, Paul B Mahol wrote: > On 9/28/15, Michael Niedermayer <michae...@gmx.at> wrote: > > From: Michael Niedermayer <mich...@niedermayer.cc> > > > > Fixes deadlock with threads > > > > Found-by: Paul B Mahol > > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > > --- > > libavcodec/pngdec.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > > index ee11f12..743144b 100644 > > --- a/libavcodec/pngdec.c > > +++ b/libavcodec/pngdec.c > > @@ -1217,6 +1217,7 @@ exit_loop: > > } > > } > > ff_thread_report_progress(&s->picture, INT_MAX, 0); > > + ff_thread_report_progress(&s->previous_picture, INT_MAX, 0); > > > > av_frame_set_metadata(p, metadata); > > metadata = NULL; > > @@ -1225,6 +1226,7 @@ exit_loop: > > fail: > > av_dict_free(&metadata); > > ff_thread_report_progress(&s->picture, INT_MAX, 0); > > + ff_thread_report_progress(&s->previous_picture, INT_MAX, 0); > > return ret; > > } > > > > -- > > 1.7.9.5 > > lgtm
applied thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Many that live deserve death. And some that die deserve life. Can you give it to them? Then do not be too eager to deal out death in judgement. For even the very wise cannot see all ends. -- Gandalf
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
