Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jun 2014 15:13:56 +0000 (17:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Jun 2014 15:25:09 +0000 (17:25 +0200)
* commit '1619274fb393f55a365cc10f88faa173c9a8e772':
  av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/dict.c

Simple merge