Merge commit 'c69461d73797e02e7a3ab4316050c241fa91f53f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:45:38 +0000 (08:45 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 19 Jan 2016 07:45:38 +0000 (08:45 +0100)
* commit 'c69461d73797e02e7a3ab4316050c241fa91f53f':
  asfdec: only set asf_pkt->data_size after sanity checks

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge