Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:41:26 +0000 (13:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Sep 2013 11:44:37 +0000 (13:44 +0200)
commit8b85d9bfb6f1b5a2bbdc732f0e20f65f2eddcaad
treef5b57f046a9499fe145c25b49346ea39dd062349
parenteed40b29570b7ef5695ab2296cc634278d533c50
parentb772b0e28eba6abf76d86ee8c6e459a86642db5a
Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'

* commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a':
  vc1dec: Undo mpegvideo initialization if unable to allocate tables

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