Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:28:24 +0000 (20:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:28:24 +0000 (20:28 +0100)
commitbcadf5d940e72fbd5f9c6a72dfdef7edcf551a33
tree733d6f35153b0b08ca41eaf969884b1d882629a4
parent038f3a173f59c9fc3396aa38e7972661da7ca504
parent1279221cc4d63bc4449df86ae7a98e633f8be425
Merge commit '1279221cc4d63bc4449df86ae7a98e633f8be425'

* commit '1279221cc4d63bc4449df86ae7a98e633f8be425':
  lavu: Check av_dict_set allocations

Conflicts:
libavutil/dict.c

See: a963fdb0ea3fa6772ff8464838cd217a6369abfe
Merged-by: Michael Niedermayer <michaelni@gmx.at>