Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 10:57:58 +0000 (12:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 10:57:58 +0000 (12:57 +0200)
commitaf539319af3a2c173e275fb927c7069e6b167114
tree5ca40632b1bb05f9ca59ac7eca08eec12946ae80
parentf8932d990228c53ee498b17eadf9dae4755c87ab
parentf3d57dc69145f1b7acb4870da9ce60378190a1fd
Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd'

* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
libavcodec/smacker.c

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