[FFmpeg-devel] [PATCH 1/3] dict.c: Free non-strduped av_dict_set arguments on error.

[Reimar Döffinger]

On Tue, Jul 29, 2014 at 10:13:39PM +0200, Michael Niedermayer wrote:
> On Tue, Jul 29, 2014 at 09:26:48PM +0200, Reimar Döffinger wrote:
> > Unfortunately this was not explicitly documented and thus
> > might be very risky.
> > But basically all uses I saw in FFmpeg had a memleak in these
> > cases.
> > 
> > Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
> > ---
> >  libavutil/dict.c | 9 +++++++--
> >  libavutil/dict.h | 2 ++
> >  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> doesnt apply
> 
> Applying: dict.c: Free non-strduped av_dict_set arguments on error.
> fatal: sha1 information is lacking or useless (libavutil/dict.c).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 dict.c: Free non-strduped av_dict_set arguments on error.

Sorry, I messed this up at some point.
Resent, with the missing patch which was the real reason for all this,
and with order changed to make a bit more sense.