Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jul 2013 13:45:03 +0000 (15:45 +0200)
commitee7da5baccc3e038179c4072e9bab00b5689c1a9
treeca7e82effbf112f838e5bd959cccd0dbc67becd7
parent44741113257b8f5e21f4676894d3ff9b9e5f99ac
parent589e5b52f634f6b2d307a167a19eef7e7328cb08
Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'

* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
  jpeg2000: Use the correct sizeof in memset for T1 data
  jpeg2000: Simplify init_tile()
  jpeg2000: Update pixel format support

Conflicts:
libavcodec/jpeg2000dec.c

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