Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:29:29 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:29:58 +0000 (13:29 +0200)
commiteed40b29570b7ef5695ab2296cc634278d533c50
treef1ad1839735a93605bf0646fddca0ecc8ebd1657
parent621845feccd15cb035d55089aa16e07514fab89e
parentede508443e4bf57dc1e019fac81bf6244b88fbd3
Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'

* commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3':
  vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dec.c