Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:46:21 +0000 (14:46 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 8 Sep 2015 12:46:21 +0000 (14:46 +0200)
commit8998caf0a4d7e55f040c419f984be885ca0688db
treed7e26e9947c2fa7f460439aeffc74d5426886fa3
parentf4ce8cea7327a452441a5920426cb391adca61b2
parent77cf23668991bfd1fb69339f13e1511b4186b7b3
Merge commit '77cf23668991bfd1fb69339f13e1511b4186b7b3'

* commit '77cf23668991bfd1fb69339f13e1511b4186b7b3':
  asfdec: alloc enough space for storing name in asf_read_metadata_obj

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavformat/asfdec_o.c