Merge commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:18:05 +0000 (15:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 12 Sep 2015 13:18:05 +0000 (15:18 +0200)
commitde969904b18b438120be8b5bf99a351aa55db545
tree838a494befe8eb78e59981acd5a712b2ab77d3e7
parent73e9f04ea5e80e7b99420ec4bbf6995430146ff8
parentc0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa
Merge commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa'

* commit 'c0a49077ea4ff3a0ad30b9e33f1bb06ba9112aaa':
  asfdec: add more checks for size left in asf packet buffer

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