Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:45 +0000 (10:41 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 2 Aug 2015 08:41:45 +0000 (10:41 +0200)
commit07094e5e405408df593d16421286bb9eb4188365
tree3d5f3085a9ca52df22ba4fa2c2b3b5182c37c288
parentd95fee4425285e90604cda48375069f5ef090ce3
parent78491fe8cfed83d2aead95dafe26f0d3f999e961
Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'

* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961':
  asfdec: do not export empty metadata

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