Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 22:54:51 +0000 (00:54 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 22:54:55 +0000 (00:54 +0200)
commitdb1ab7e5af6aeafb04db153828a266d1d998a78e
tree785633cabab5d383d4d9c678380f5e12404ecd0c
parent4bde1a4a374e0cc939bbdd8260dad77432ca03c1
parentc571424c7f6276a6374e1784ce2a33d4b6a4292d
Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d'

* commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d':
  asfdec: prevent memory leaks found with Coverity Scan

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/asfdec_o.c