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)
* commit 'daeb4e3042f2ecae2d41aaa4cae0bed932539788':
  jpeg2000: Proper cleanup on failure in decode_frame()

Conflicts:
libavcodec/jpeg2000.c

See: 9d56ccf5

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

Simple merge
Simple merge