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)
commit375fa061255a244879df306143628a18c74ee74d
treedb472d6349260bd348f92a9945a6bc0c7d0a74cb
parent383d8ddf29513c614778db269899aba71094c051
parent1619274fb393f55a365cc10f88faa173c9a8e772
Merge commit '1619274fb393f55a365cc10f88faa173c9a8e772'

* commit '1619274fb393f55a365cc10f88faa173c9a8e772':
  av_dict_set: fix potential memory leak with AV_DICT_DONT_OVERWRITE

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