Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 14:20:40 +0000 (15:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 14:20:40 +0000 (15:20 +0100)
commit7a79c055e378d1a079d439c3e99fa45289d4a68e
tree4a0a1e4544ae2388902c363a74af398f7ea41a5e
parent45660c7d1b76185de97160808d81885f9dd08e23
parenta2448cfe167a4cd4eb631318550d4eef38fca24a
Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'

* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
  jpeg2000: do not compute the same value twice

Conflicts:
libavcodec/jpeg2000.c

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