[FFmpeg-devel] [PATCH] avcodec/pngdec: mark previous_picture as done on end of decode_frame_common()

[Michael Niedermayer]

On Wed, Sep 30, 2015 at 04:38:40PM +0200, Paul B Mahol wrote:
> On 9/28/15, Michael Niedermayer <michaelni at gmx.at> wrote:
> > From: Michael Niedermayer <michael at niedermayer.cc>
> >
> > Fixes deadlock with threads
> >
> > Found-by: Paul B Mahol
> > Signed-off-by: Michael Niedermayer <michael at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20151001/93d8d1a9/attachment.sig>