Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 10:16:24 +0000 (12:16 +0200)
commit26f6acc66b668aa9cb97d487aa980a361d4030a1
tree2a64ea7b14bf1d85948200fb02c03473d6726146
parentb0448e51235760b6ba8e9562c1233e43e818a1f7
parent5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4
Merge commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4'

* commit '5efadcb8cdef6fc5ca5f1f72e45ef3b23016b1c4':
  jpeg2000: Clean up return paths and error messages

Conflicts:
libavcodec/jpeg2000dec.c

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