Commit bcadf5d9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1279221c'

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

Conflicts:
	libavutil/dict.c

See: a963fdb0Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 038f3a17 1279221c
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment