Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:11:01 +0000 (16:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 14:11:01 +0000 (16:11 +0200)
commit1abb875c980ab9ab12bc6fe0e0762f489d887968
treec02035ddf57a04ea9a260553e40eaa9c22f4706b
parentee7da5baccc3e038179c4072e9bab00b5689c1a9
parentdaeb4e3042f2ecae2d41aaa4cae0bed932539788
Merge commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788'

* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
libavcodec/jpeg2000.c

See: 9d56ccf5

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